nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash that happens when mapping something like this:

Browse Source 
{ short, short }

to
  short

where the second short maps onto the second field of the first struct.  In
this case, the struct index is not aligned, so we should avoid calling
getLink(2), which asserts out.

llvm-svn: 20626
This commit is contained in:
Chris Lattner
2005-03-15 21:36:50 +00:00
parent aa254d5f79
commit dadf4b369e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Analysis/DataStructure/DataStructure.cpp
View File

@@ -2077,12 +2077,18 @@ void DSGraph::computeNodeMapping(const DSNodeHandle &NH1,
unsigned N2Size = N2->getSize();
if (N2Size == 0) return; // No edges to map to.
for (unsigned i = 0, e = N1->getSize(); i < e; i += DS::PointerSize)
if (unsigned(N2Idx)+i < N2Size)
computeNodeMapping(N1->getLink(i), N2->getLink(N2Idx+i), NodeMap);
else
computeNodeMapping(N1->getLink(i),
N2->getLink(unsigned(N2Idx+i) % N2Size), NodeMap);
for (unsigned i = 0, e = N1->getSize(); i < e; i += DS::PointerSize) {
const DSNodeHandle &N1NH = N1->getLink(i);
// Don't call N2->getLink if not needed (avoiding crash if N2Idx is not
// aligned right).
if (!N1NH.isNull()) {
if (unsigned(N2Idx)+i < N2Size)
computeNodeMapping(N1NH, N2->getLink(N2Idx+i), NodeMap);
else
computeNodeMapping(N1NH,
N2->getLink(unsigned(N2Idx+i) % N2Size), NodeMap);
}
}
}