Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with master #1

Merged
merged 2 commits into from
Jul 24, 2015
Merged

Merge with master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83256c1
Util: Fix thread call graph when connecting indirect fork edges
yuleisui Jul 24, 2015
e4ec7b8
Update index.html
yuleisui Jul 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/Util/PTACallGraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class PTACallGraphEdge : public GenericCallGraphEdgeTy {

void addInDirectCallSite(const llvm::Instruction* call) {
assert((llvm::isa<llvm::CallInst>(call) || llvm::isa<llvm::InvokeInst>(call)) && "not a call or inovke??");
assert((NULL == analysisUtil::getCallee(call)) && "not an indirect callsite??");
assert((NULL == analysisUtil::getCallee(call) || NULL == llvm::dyn_cast<llvm::Function> (analysisUtil::getForkedFun(call))) && "not an indirect callsite??");
indirectCalls.insert(call);
}
//@}
Expand Down
5 changes: 5 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ <h2>

<p>Yulei Sui, Sen Ye, Jingling Xue, and Pen-Chung Yew. SPAS: Scalable Path-Sensitive Pointer Analysis on Full-Sparse SSA, 9th Asian Symposium on Programming Languages and Systems (APLAS'11)</p>

<h2>
<a id="contacts" class="anchor" href="#contacts" aria-hidden="true"><span class="octicon octicon-link"></span></a>Contacts</h2>
Any comments, contributions and collaborations are welcomed.
Please contact <a href="mailto:ysui@cse.unsw.edu.au">Yulei Sui</a> or <a href="mailto:jingling@cse.unsw.edu.au">Jingling Xue</a> if you have any questions.

<footer class="site-footer">
<span class="site-footer-owner"><a href="https://github.com/unsw-corg/SVF">SVF</a> is maintained by <a href="http://www.cse.unsw.edu.au/~corg/">UNSW-CORG</a>.</span>

Expand Down
5 changes: 3 additions & 2 deletions lib/Util/ThreadCallGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta) {
}

for (CallSiteSet::iterator it = forksitesBegin(), eit = forksitesEnd(); it != eit; ++it) {
if(dyn_cast<Function>(tdAPI->getForkedFun(*it))==NULL) {
const Value* forkedval=tdAPI->getForkedFun(*it);
if(dyn_cast<Function>(forkedval)==NULL) {
PAG* pag = pta->getPAG();
const PointsTo& targets = pta->getPts(pag->getValueNode(*it));
const PointsTo& targets = pta->getPts(pag->getValueNode(forkedval));
for (PointsTo::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++) {
if(ObjPN* objPN = dyn_cast<ObjPN>(pag->getPAGNode(*ii))) {
const MemObj* obj = pag->getObject(objPN);
Expand Down