mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-12-24 04:25:22 +00:00
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. llvm-svn: 62838
This commit is contained in:
parent
8ef6b2d75e
commit
1dc435cdc7
@ -751,11 +751,9 @@ getNonLocalPointerDepFromBB(Value *Pointer, uint64_t PointeeSize,
|
||||
// cache remains sorted. Sort it now (if needed) so that recursive
|
||||
// invocations of getNonLocalPointerDepFromBB that could reuse the cache
|
||||
// value will only see properly sorted cache arrays.
|
||||
if (Cache && NumSortedEntries != Cache->size()) {
|
||||
if (Cache && NumSortedEntries != Cache->size())
|
||||
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
|
||||
// the same value. Consider PHI translating something like:
|
||||
@ -793,7 +791,8 @@ getNonLocalPointerDepFromBB(Value *Pointer, uint64_t PointeeSize,
|
||||
// Refresh the CacheInfo/Cache pointer so that it isn't invalidated.
|
||||
CacheInfo = &NonLocalPointerDeps[CacheKey];
|
||||
Cache = &CacheInfo->second;
|
||||
|
||||
NumSortedEntries = Cache->size();
|
||||
|
||||
// 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
|
||||
// specific block queries) but we can't do the fastpath "return all
|
||||
|
Loading…
Reference in New Issue
Block a user