Changeset 209018 in webkit for trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp

Timestamp:

Nov 28, 2016, 2:21:29 PM (9 years ago)

Author:

[email protected]

Message:

Fix exception scope verification failures in miscellaneous files.
​https://bugs.webkit.org/show_bug.cgi?id=165055

Reviewed by Saam Barati.

• runtime/MathObject.cpp:

(JSC::mathProtoFuncIMul):

• runtime/ModuleLoaderPrototype.cpp:

(JSC::moduleLoaderPrototypeParseModule):
(JSC::moduleLoaderPrototypeRequestedModules):

• runtime/NativeErrorConstructor.cpp:

(JSC::Interpreter::constructWithNativeErrorConstructor):

• runtime/NumberConstructor.cpp:

(JSC::constructWithNumberConstructor):

• runtime/SetConstructor.cpp:

(JSC::constructSet):

• runtime/SetIteratorPrototype.cpp:

(JSC::SetIteratorPrototypeFuncNext):

• runtime/SparseArrayValueMap.cpp:

(JSC::SparseArrayValueMap::putEntry):
(JSC::SparseArrayEntry::put):

• runtime/TemplateRegistry.cpp:

(JSC::TemplateRegistry::getTemplateObject):

File:

• trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp

@@ -60 +60 @@
     for (unsigned index = 0; index < count; ++index) {
         templateObject->putDirectIndex(exec, index, jsString(exec, templateKey.cookedStrings()[index]), ReadOnly | DontDelete, PutDirectIndexLikePutDirect);
+        RETURN_IF_EXCEPTION(scope, nullptr);
         rawObject->putDirectIndex(exec, index, jsString(exec, templateKey.rawStrings()[index]), ReadOnly | DontDelete, PutDirectIndexLikePutDirect);
+        RETURN_IF_EXCEPTION(scope, nullptr);
     }
 
@@ -66 +68 @@
     ASSERT(!scope.exception());
 
-    templateObject->putDirect(vm, exec->propertyNames().raw, rawObject, ReadOnly | DontEnum | DontDelete);
+    templateObject->putDirect(vm, vm.propertyNames->raw, rawObject, ReadOnly | DontEnum | DontDelete);
 
     // Template JSArray hold the reference to JSTemplateRegistryKey to make TemplateRegistryKey pointer live until this JSArray is collected.