Add FlushProcessWriteBuffers

dotnet · Aug 28, 2019 · d54026d · d54026d
1 parent afb84f3
commit d54026d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/vm/genericdict.cpp b/src/vm/genericdict.cpp
@@ -338,6 +338,9 @@ BOOL DictionaryLayout::FindToken(MethodTable*                       pMT,
         // can start using newly added dictionary layout slots on types where the PerInstInfo hasn't expanded yet, and cause runtime failures.
         pMT->GetClass()->SetDictionaryLayout(pNewLayout);
 
+        // Ensure no other thread uses old dictionary pointers
+        FlushProcessWriteBuffers();
+
         return TRUE;
 #else
         pResult->signature = pSigBuilder == NULL ? pSig : CreateSignatureWithSlotData(pSigBuilder, pAllocator, 0);
@@ -394,6 +397,9 @@ BOOL DictionaryLayout::FindToken(MethodDesc*                        pMD,
         // can start using newly added dictionary layout slots on methods where the PerInstInfo hasn't expanded yet, and cause runtime failures.
         pMD->AsInstantiatedMethodDesc()->IMD_SetDictionaryLayout(pNewLayout);
 
+        // Ensure no other thread uses old dictionary pointers
+        FlushProcessWriteBuffers();
+
         return TRUE;
 #else
         pResult->signature = pSigBuilder == NULL ? pSig : CreateSignatureWithSlotData(pSigBuilder, pAllocator, 0);

diff --git a/src/vm/interoputil.cpp b/src/vm/interoputil.cpp
@@ -5833,7 +5833,7 @@ MethodDesc *WinRTInterfaceRedirector::GetStubMethodForRedirectedInterface(WinMDA
 
                 if (interfaceIndex == WinMDAdapter::RedirectedTypeIndex_System_Collections_Generic_IDictionary ||
                     interfaceIndex == WinMDAdapter::RedirectedTypeIndex_System_Collections_Generic_IReadOnlyDictionary)
-                {                
+                {
                     thKvPair = TypeHandle(MscorlibBinder::GetClass(CLASS__KEYVALUEPAIRGENERIC)).Instantiate(inst);
                     inst = Instantiation(&thKvPair, 1);
                 }