Changeset 230105 in webkit for trunk/Source/JavaScriptCore/runtime/Lookup.cpp

Timestamp:

Mar 30, 2018, 9:05:22 AM (7 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r230102.

Caused assertion failures on JSC bots.

Reverted changeset:

"A stack overflow in the parsing of a builtin (called by
createExecutable) cause a crash instead of a catchable js
exception"
​https://bugs.webkit.org/show_bug.cgi?id=184074
​https://trac.webkit.org/changeset/230102

File:

• trunk/Source/JavaScriptCore/runtime/Lookup.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/Lookup.cpp

@@ -34 +34 @@
         JSFunction* function = nullptr;
         if (value.attributes() & PropertyAttribute::Builtin)
-            function = JSFunction::create(vm, value.builtinAccessorGetterGenerator()(vm).value(), globalObject);
+            function = JSFunction::create(vm, value.builtinAccessorGetterGenerator()(vm), globalObject);
         else {
             String getterName = tryMakeString(ASCIILiteral("get "), String(*propertyName.publicName()));
@@ -46 +46 @@
 }
 
-bool setUpStaticFunctionSlot(ExecState* exec, const ClassInfo* classInfo, const HashTableValue* entry, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
+bool setUpStaticFunctionSlot(VM& vm, const ClassInfo* classInfo, const HashTableValue* entry, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
 {
-    VM& vm = exec->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
     ASSERT(thisObject->globalObject());
     ASSERT(entry->attributes() & PropertyAttribute::BuiltinOrFunctionOrAccessorOrLazyProperty);
@@ -62 +60 @@
             return false;
 
-        reifyStaticProperty(vm, exec, classInfo, propertyName, *entry, *thisObject);
-        RETURN_IF_EXCEPTION(scope, false);
+        reifyStaticProperty(vm, classInfo, propertyName, *entry, *thisObject);
 
         offset = thisObject->getDirectOffset(vm, propertyName, attributes);