[cfe-commits] r169586 - /cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
Ted Kremenek
kremenek at apple.com
Thu Dec 6 22:49:28 PST 2012
Author: kremenek
Date: Fri Dec 7 00:49:27 2012
New Revision: 169586
URL: http://llvm.org/viewvc/llvm-project?rev=169586&view=rev
Log:
Further reduce analysis time by 0.2% on a heavy Objective-C example by avoiding over-eager canonicalization of clusters.
Modified:
cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
Modified: cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp?rev=169586&r1=169585&r2=169586&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp Fri Dec 7 00:49:27 2012
@@ -131,7 +131,8 @@
// Actual Store type.
//===----------------------------------------------------------------------===//
-typedef llvm::ImmutableMap<BindingKey, SVal> ClusterBindings;
+typedef llvm::ImmutableMap<BindingKey, SVal> ClusterBindings;
+typedef llvm::ImmutableMapRef<BindingKey, SVal> ClusterBindingsRef;
typedef llvm::ImmutableMap<const MemRegion *, ClusterBindings>
RegionBindings;
@@ -705,7 +706,7 @@
if (!Cluster)
return B;
- ClusterBindings Result = *Cluster;
+ ClusterBindingsRef Result(*Cluster, CBFactory);
// It is safe to iterate over the bindings as they are being changed
// because they are in an ImmutableMap.
@@ -722,7 +723,7 @@
NextKey.getOffset() - SRKey.getOffset() < Length) {
// Case 1: The next binding is inside the region we're invalidating.
// Remove it.
- Result = CBFactory.remove(Result, NextKey);
+ Result = Result.remove(NextKey);
} else if (NextKey.getOffset() == SRKey.getOffset()) {
// Case 2: The next binding is at the same offset as the region we're
@@ -732,7 +733,7 @@
// FIXME: This is probably incorrect; consider invalidating an outer
// struct whose first field is bound to a LazyCompoundVal.
if (NextKey.isDirect())
- Result = CBFactory.remove(Result, NextKey);
+ Result = Result.remove(NextKey);
}
} else if (NextKey.hasSymbolicOffset()) {
@@ -743,13 +744,13 @@
// we'll be conservative and remove it.
if (NextKey.isDirect())
if (isCompatibleWithFields(NextKey, FieldsInSymbolicSubregions))
- Result = CBFactory.remove(Result, NextKey);
+ Result = Result.remove(NextKey);
} else if (const SubRegion *BaseSR = dyn_cast<SubRegion>(Base)) {
// Case 4: The next key is symbolic, but we changed a known
// super-region. In this case the binding is certainly no longer valid.
if (R == Base || BaseSR->isSubRegionOf(R))
if (isCompatibleWithFields(NextKey, FieldsInSymbolicSubregions))
- Result = CBFactory.remove(Result, NextKey);
+ Result = Result.remove(NextKey);
}
}
}
@@ -758,11 +759,11 @@
// we don't treat the base region as uninitialized anymore.
// FIXME: This isn't very precise; see the example in the loop.
if (HasSymbolicOffset)
- Result = CBFactory.add(Result, SRKey, UnknownVal());
+ Result = Result.add(SRKey, UnknownVal());
if (Result.isEmpty())
return B.remove(ClusterHead);
- return B.add(ClusterHead, Result);
+ return B.add(ClusterHead, Result.asImmutableMap());
}
namespace {
More information about the cfe-commits
mailing list