maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

IRBuilder: Ensure we do not add empty map elements 

Do not use "Map[Key] == nullptr" to check if a Key is in the map, but use
"Map.find(Key) == Map.end()". Map[Key] always adds Key into the map, a
side-effect we do not want.

Found by inspection. This is hard to test outside of a targetted unit test,
which seems too much overhead for this individual issue.

llvm-svn: 249544
This commit is contained in:
Tobias Grosser 2015-10-07 13:19:06 +00:00
parent 73725b8ba5
commit d79cb0378b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
polly/lib/CodeGen/IRBuilder.cpp
View File

@ -146,12 +146,22 @@ void ScopAnnotator::annotate(Instruction *Inst) {
if (!BasePtr)
return;
auto *AliasScope = AliasScopeMap[BasePtr];
auto AliasScopeIterator = AliasScopeMap.find(BasePtr);
if (!AliasScope)
BasePtr = AlternativeAliasBases[BasePtr];
if (AliasScopeIterator == AliasScopeMap.end()) {
auto I = AlternativeAliasBases.find(BasePtr);
if (I == AlternativeAliasBases.end())
return;
AliasScope = AliasScopeMap[BasePtr];
BasePtr = I->second;
AliasScopeIterator = AliasScopeMap.find(BasePtr);
if (AliasScopeIterator == AliasScopeMap.end())
return;
}
auto AliasScope = AliasScopeIterator->second;
assert(OtherAliasScopeListMap.count(BasePtr) &&
"BasePtr either expected in AliasScopeMap and OtherAlias...Map");
auto *OtherAliasScopeList = OtherAliasScopeListMap[BasePtr];
Inst->setMetadata("alias.scope", AliasScope);