Regenerate cache key after the valueenumeraor is invalidated. Exposed by another painful memory behavior cache bug

Author: trentxintong

lib/SILOptimizer/Analysis/AliasAnalysis.cpp

@@ -537,6 +537,9 @@ AliasResult AliasAnalysis::alias(SILValue V1, SILValue V2,
     AliasValueBaseToIndex.clear();
   }
 
+  // Key is no longer valid as we cleared the AliasValueBaseToIndex.
+  Key = toAliasKey(V1, V2, TBAAType1, TBAAType2);
+
   // Calculate the aliasing result and store it in the cache.
   auto Result = aliasInner(V1, V2, TBAAType1, TBAAType2);
   AliasCache[Key] = Result;

lib/SILOptimizer/Analysis/MemoryBehavior.cpp

@@ -317,6 +317,9 @@ AliasAnalysis::computeMemoryBehavior(SILInstruction *Inst, SILValue V,
     MemoryBehaviorValueBaseToIndex.clear();
   }
 
+  // Key no longer valid as we cleared the MemoryBehaviorValueBaseToIndex.
+  Key = toMemoryBehaviorKey(SILValue(Inst), V, InspectionMode);
+
   // Calculate the aliasing result and store it in the cache.
   auto Result = computeMemoryBehaviorInner(Inst, V, InspectionMode);
   MemoryBehaviorCache[Key] = Result;