Title: [244872] trunk
Diff
Modified: trunk/JSTests/ChangeLog (244871 => 244872)
--- trunk/JSTests/ChangeLog 2019-05-02 15:21:58 UTC (rev 244871)
+++ trunk/JSTests/ChangeLog 2019-05-02 16:17:53 UTC (rev 244872)
@@ -1,3 +1,9 @@
+2019-05-02 Michael Saboff <[email protected]>
+
+ Unreviewed rollout of r244862.
+
+ * stress/proxy-getOwnPropertySlots-exceptionChecks.js:
+
2019-05-01 Saam barati <[email protected]>
Baseline JIT should do argument value profiling after checking for stack overflow
Modified: trunk/JSTests/stress/proxy-getOwnPropertySlots-exceptionChecks.js (244871 => 244872)
--- trunk/JSTests/stress/proxy-getOwnPropertySlots-exceptionChecks.js 2019-05-02 15:21:58 UTC (rev 244871)
+++ trunk/JSTests/stress/proxy-getOwnPropertySlots-exceptionChecks.js 2019-05-02 16:17:53 UTC (rev 244872)
@@ -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
Modified: trunk/Source/_javascript_Core/ChangeLog (244871 => 244872)
--- trunk/Source/_javascript_Core/ChangeLog 2019-05-02 15:21:58 UTC (rev 244871)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-05-02 16:17:53 UTC (rev 244872)
@@ -1,3 +1,10 @@
+2019-05-02 Michael Saboff <[email protected]>
+
+ Unreviewed rollout of r244862.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::getOwnPropertyDescriptor):
+
2019-05-01 Saam barati <[email protected]>
Baseline JIT should do argument value profiling after checking for stack overflow
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (244871 => 244872)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2019-05-02 15:21:58 UTC (rev 244871)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2019-05-02 16:17:53 UTC (rev 244872)
@@ -3441,14 +3441,10 @@
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 @@
descriptor.setSetter(getCustomGetterSetterFunctionForGetterSetter(exec, propertyName, getterSetter, JSCustomGetterSetterFunction::Type::Setter));
} else
descriptor.setDescriptor(slot.getValue(exec, propertyName), slot.attributes());
-
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
