Unconditionally reset 'cache' to zero, even if we don't need to resort it.

This avoids using a dangling pointer.

Reset NumSortedEntries after restoring Cache to avoid extraneous sorts.
This fixes the reduced sqlite3 testcase, but apparently not the whole app.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62838 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-01-23 06:48:41 +00:00
parent c16d37ead0
commit 4433a09b9f

View File

@ -751,11 +751,9 @@ getNonLocalPointerDepFromBB(Value *Pointer, uint64_t PointeeSize,
// cache remains sorted. Sort it now (if needed) so that recursive // cache remains sorted. Sort it now (if needed) so that recursive
// invocations of getNonLocalPointerDepFromBB that could reuse the cache // invocations of getNonLocalPointerDepFromBB that could reuse the cache
// value will only see properly sorted cache arrays. // value will only see properly sorted cache arrays.
if (Cache && NumSortedEntries != Cache->size()) { if (Cache && NumSortedEntries != Cache->size())
std::sort(Cache->begin(), Cache->end()); std::sort(Cache->begin(), Cache->end());
NumSortedEntries = Cache->size(); Cache = 0;
Cache = 0;
}
// FIXME: it is entirely possible that PHI translating will end up with // FIXME: it is entirely possible that PHI translating will end up with
// the same value. Consider PHI translating something like: // the same value. Consider PHI translating something like:
@ -793,6 +791,7 @@ getNonLocalPointerDepFromBB(Value *Pointer, uint64_t PointeeSize,
// Refresh the CacheInfo/Cache pointer so that it isn't invalidated. // Refresh the CacheInfo/Cache pointer so that it isn't invalidated.
CacheInfo = &NonLocalPointerDeps[CacheKey]; CacheInfo = &NonLocalPointerDeps[CacheKey];
Cache = &CacheInfo->second; Cache = &CacheInfo->second;
NumSortedEntries = Cache->size();
// Since we did phi translation, the "Cache" set won't contain all of the // Since we did phi translation, the "Cache" set won't contain all of the
// results for the query. This is ok (we can still use it to accelerate // results for the query. This is ok (we can still use it to accelerate