Bug 1451524: Switch the default interceptor VM policy over from uniqu…

…e to shared; r=handyman
iaxat · Apr 25, 2018 · 74faba8 · 74faba8
1 parent 1c804a6
commit 74faba8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/mozglue/misc/interceptor/VMSharingPolicies.h b/mozglue/misc/interceptor/VMSharingPolicies.h
@@ -9,7 +9,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Types.h"
-#include "mozilla/StaticPtr.h"
 
 namespace mozilla {
 namespace interceptor {
@@ -165,15 +164,17 @@ class VMSharingPolicyShared : public MMPolicyBase
       return;
     }
 
-    MOZ_RELEASE_ASSERT(sPerProcVM->append(ProcMapEntry(aArgs...)));
+    bool appended = sPerProcVM->append(ProcMapEntry(aArgs...));
+    MOZ_RELEASE_ASSERT(appended);
   }
 
   explicit operator bool() const
   {
     AutoCriticalSection lock(&sCS);
 
     ProcMapEntry* entry;
-    MOZ_RELEASE_ASSERT(find(mPid, &entry));
+    bool found = find(mPid, &entry);
+    MOZ_RELEASE_ASSERT(found);
 
     return !!entry->mVMPolicy;
   }
@@ -183,7 +184,8 @@ class VMSharingPolicyShared : public MMPolicyBase
     AutoCriticalSection lock(&sCS);
 
     ProcMapEntry* entry;
-    MOZ_RELEASE_ASSERT(find(mPid, &entry));
+    bool found = find(mPid, &entry);
+    MOZ_RELEASE_ASSERT(found);
 
     return entry->mVMPolicy;
   }
@@ -241,7 +243,8 @@ class VMSharingPolicyShared : public MMPolicyBase
     AutoCriticalSection lock(&sCS);
 
     ProcMapEntry* entry;
-    MOZ_RELEASE_ASSERT(find(mPid, &entry));
+    bool found = find(mPid, &entry);
+    MOZ_RELEASE_ASSERT(found);
 
     TrampolineCollection<MMPolicy> items(Move(entry->mVMPolicy.Items()));
 
@@ -292,12 +295,12 @@ class VMSharingPolicyShared : public MMPolicyBase
   static DWORD GetPid(HANDLE aHandle) { return ::GetProcessId(aHandle); }
 
   DWORD mPid;
-  static StaticAutoPtr<MapT> sPerProcVM;
+  static MapT* sPerProcVM;
   static CRITICAL_SECTION sCS;
 };
 
 template <typename MMPolicy, uint32_t kChunkSize>
-StaticAutoPtr<typename VMSharingPolicyShared<MMPolicy, kChunkSize>::MapT>
+typename VMSharingPolicyShared<MMPolicy, kChunkSize>::MapT *
   VMSharingPolicyShared<MMPolicy, kChunkSize>::sPerProcVM;
 
 template <typename MMPolicy, uint32_t kChunkSize>

diff --git a/mozglue/misc/nsWindowsDllInterceptor.h b/mozglue/misc/nsWindowsDllInterceptor.h
@@ -88,7 +88,7 @@ enum
 };
 
 template <typename VMPolicy =
-            mozilla::interceptor::VMSharingPolicyUnique<
+            mozilla::interceptor::VMSharingPolicyShared<
               mozilla::interceptor::MMPolicyInProcess, kDefaultTrampolineSize>>
 class WindowsDllInterceptor final
 {