Unreviewed rollout of r244862.
authormsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 May 2019 16:17:53 +0000 (16:17 +0000)
committermsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 May 2019 16:17:53 +0000 (16:17 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JSTests/ChangeLog
JSTests/stress/proxy-getOwnPropertySlots-exceptionChecks.js
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/JSObject.cpp

index e5487fe..37b413a 100644 (file)
@@ -1,3 +1,9 @@
+2019-05-02  Michael Saboff  <msaboff@apple.com>
+
+        Unreviewed rollout of r244862.
+
+        * stress/proxy-getOwnPropertySlots-exceptionChecks.js:
+
 2019-05-01  Saam barati  <sbarati@apple.com>
 
         Baseline JIT should do argument value profiling after checking for stack overflow
index 9ffe0ce..0a5ff6d 100644 (file)
@@ -1,4 +1,6 @@
-//@ runWithoutBaseOption("default", "--validateExceptionChecks=1")
+//@ skip
+// Skipping this test while https://bugs.webkit.org/show_bug.cgi?id=197485 is being fixed
+//   @ runWithoutBaseOption("default", "--validateExceptionChecks=1")
 
 // This test that we have appropriate exception check processing Proxy.getOwnPropertySlots
 
index 84b4423..2d4298f 100644 (file)
@@ -1,3 +1,10 @@
+2019-05-02  Michael Saboff  <msaboff@apple.com>
+
+        Unreviewed rollout of r244862.
+
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::getOwnPropertyDescriptor):
+
 2019-05-01  Saam barati  <sbarati@apple.com>
 
         Baseline JIT should do argument value profiling after checking for stack overflow
index e1d022e..8d3a0e7 100644 (file)
@@ -3441,14 +3441,10 @@ static JSCustomGetterSetterFunction* getCustomGetterSetterFunctionForGetterSette
 bool JSObject::getOwnPropertyDescriptor(ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
 {
     VM& vm = exec->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-
     JSC::PropertySlot slot(this, PropertySlot::InternalMethodType::GetOwnProperty);
     if (!methodTable(vm)->getOwnPropertySlot(this, exec, propertyName, slot))
         return false;
-    EXCEPTION_ASSERT(!scope.exception());
-    scope.release();
-    
+
     // DebuggerScope::getOwnPropertySlot() (and possibly others) may return attributes from the prototype chain
     // but getOwnPropertyDescriptor() should only work for 'own' properties so we exit early if we detect that
     // the property is not an own property.
@@ -3494,7 +3490,6 @@ bool JSObject::getOwnPropertyDescriptor(ExecState* exec, PropertyName propertyNa
             descriptor.setSetter(getCustomGetterSetterFunctionForGetterSetter(exec, propertyName, getterSetter, JSCustomGetterSetterFunction::Type::Setter));
     } else
         descriptor.setDescriptor(slot.getValue(exec, propertyName), slot.attributes());
-
     return true;
 }