Bug 952285 - Clarify some code in TypeRepresentation for the hazard analysis; r=nmatsakis

--HG--
extra : rebase_source : dce9b8d79f645fd90e4049bf18e3056b25fd1740

js/src/builtin/TypeRepresentation.cpp

@@ -453,8 +453,11 @@ class TypeRepresentationHelper {
     static JSObject *CreateSimple(JSContext *cx, typename T::Type type) {
         JSCompartment *comp = cx->compartment();
 
+        TypeRepresentationHash::AddPtr p;
+        {
             T sample(type);
-        TypeRepresentationHash::AddPtr p = comp->typeReprs.lookupForAdd(&sample);
+            p = comp->typeReprs.lookupForAdd(&sample);
+        }
         if (p)
             return (*p)->ownerObject();
 
@@ -492,8 +495,11 @@ ReferenceTypeRepresentation::Create(JSContext *cx,
 {
     JSCompartment *comp = cx->compartment();
 
+    TypeRepresentationHash::AddPtr p;
+    {
         ReferenceTypeRepresentation sample(type);
-    TypeRepresentationHash::AddPtr p = comp->typeReprs.lookupForAdd(&sample);
+        p = comp->typeReprs.lookupForAdd(&sample);
+    }
     if (p)
         return (*p)->ownerObject();
 
@@ -526,8 +532,11 @@ SizedArrayTypeRepresentation::Create(JSContext *cx,
         return nullptr;
     }
 
+    TypeRepresentationHash::AddPtr p;
+    {
         SizedArrayTypeRepresentation sample(element, length);
-    TypeRepresentationHash::AddPtr p = comp->typeReprs.lookupForAdd(&sample);
+        p = comp->typeReprs.lookupForAdd(&sample);
+    }
     if (p)
         return (*p)->ownerObject();
 
@@ -550,8 +559,11 @@ UnsizedArrayTypeRepresentation::Create(JSContext *cx,
 {
     JSCompartment *comp = cx->compartment();
 
+    TypeRepresentationHash::AddPtr p;
+    {
         UnsizedArrayTypeRepresentation sample(element);
-    TypeRepresentationHash::AddPtr p = comp->typeReprs.lookupForAdd(&sample);
+        p = comp->typeReprs.lookupForAdd(&sample);
+    }
     if (p)
         return (*p)->ownerObject();