[llvm-branch-commits] [cfe-branch] r71336 - /cfe/branches/Apple/Dib/lib/Analysis/RegionStore.cpp

[Mike Stump]

Author: mrs
Date: Sat May  9 01:20:30 2009
New Revision: 71336

URL: http://llvm.org/viewvc/llvm-project?rev=71336&view=rev
Log:
Merge in 71288:

Fix PR4182.

Modified:
    cfe/branches/Apple/Dib/lib/Analysis/RegionStore.cpp

Modified: cfe/branches/Apple/Dib/lib/Analysis/RegionStore.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Analysis/RegionStore.cpp?rev=71336&r1=71335&r2=71336&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Analysis/RegionStore.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Analysis/RegionStore.cpp Sat May  9 01:20:30 2009
@@ -1063,10 +1063,10 @@
 
       // Get the current set of subregions for SuperR.
       const SubRegionsTy* SRptr = SubRegMap.lookup(SuperR);
-      SubRegionsTy SR = SRptr ? *SRptr : SubRegF.GetEmptySet();
+      SubRegionsTy SRs = SRptr ? *SRptr : SubRegF.GetEmptySet();
 
       // Add R to the subregions of SuperR.
-      SubRegMap = SubRegMapF.Add(SubRegMap, SuperR, SubRegF.Add(SR, R));
+      SubRegMap = SubRegMapF.Add(SubRegMap, SuperR, SubRegF.Add(SRs, R));
 
       // Super region may be VarRegion or subregion of another VarRegion. Add it
       // to the work list.