Changeset 206408 in webkit for trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp

Timestamp:

Sep 26, 2016, 7:46:19 PM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r206405.
​https://bugs.webkit.org/show_bug.cgi?id=162588

This change caused LayoutTest crashes. (Requested by
ryanhaddad on #webkit).

Reverted changeset:

"Add some needed CatchScopes in code that should not throw."
​https://bugs.webkit.org/show_bug.cgi?id=162584
​http://trac.webkit.org/changeset/206405

File:

• trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp

@@ -592 +592 @@
         return String();
 
-    auto scope = DECLARE_CATCH_SCOPE(vm);
     ExecState* exec = callee->globalObject()->globalExec();
     auto getPropertyIfPureOperation = [&] (const Identifier& ident) -> String {
         PropertySlot slot(callee, PropertySlot::InternalMethodType::VMInquiry);
         PropertyName propertyName(ident);
-        bool hasProperty = callee->getPropertySlot(exec, propertyName, slot);
-        ASSERT_UNUSED(scope, !scope.exception());
-        if (hasProperty) {
+        if (callee->getPropertySlot(exec, propertyName, slot)) {
             if (slot.isValue()) {
                 JSValue nameValue = slot.getValue(exec, propertyName);