Changeset 209678 in webkit for trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp

Timestamp:

Dec 10, 2016, 5:14:37 PM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r209653, r209654, r209663, and
r209673.
​https://bugs.webkit.org/show_bug.cgi?id=165739

speedometer crashes (Requested by pizlo on #webkit).

Reverted changesets:

"JSVALUE64: Pass arguments in platform argument registers when
making JavaScript calls"
​https://bugs.webkit.org/show_bug.cgi?id=160355
​http://trac.webkit.org/changeset/209653

"Unreviewed build fix for 32 bit builds."
​http://trac.webkit.org/changeset/209654

"Unreviewed build fix for the CLOOP after r209653"
​http://trac.webkit.org/changeset/209663

"REGRESSION(r209653) Crash in CallFrameShuffler::snapshot()"
​https://bugs.webkit.org/show_bug.cgi?id=165728
​http://trac.webkit.org/changeset/209673

File:

• trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp

@@ -285 +285 @@
             bool isTailDeleted = false;
             JSScope* scope = nullptr;
-            JSValue thisValue = jsUndefined();
             CodeBlock* codeBlock = callFrame->codeBlock();
-            if (codeBlock && codeBlock->wasCompiledWithDebuggingOpcodes()) {
-                if (codeBlock->scopeRegister().isValid()) {
-                    scope = callFrame->scope(codeBlock->scopeRegister().offset());
+            if (codeBlock && codeBlock->wasCompiledWithDebuggingOpcodes() && codeBlock->scopeRegister().isValid()) {
+                scope = callFrame->scope(codeBlock->scopeRegister().offset());
+                RELEASE_ASSERT(scope->inherits(JSScope::info()));
+            } else if (foundFrame) {
+                scope = m_log[indexInLog].scope;
+                if (scope)
                     RELEASE_ASSERT(scope->inherits(JSScope::info()));
-                }
-                thisValue = callFrame->thisValue();
-            } else if (foundFrame) {
-                if (!scope) {
-                    scope = m_log[indexInLog].scope;
-                    if (scope)
-                        RELEASE_ASSERT(scope->inherits(JSScope::info()));
-                }
-                if (thisValue.isUndefined())
-                    thisValue = m_log[indexInLog].thisValue;
-            }
-            toPush.append(Frame(visitor->callee(), callFrame, isTailDeleted, thisValue, scope, codeBlock, callFrame->callSiteIndex()));
+            }
+            toPush.append(Frame(visitor->callee(), callFrame, isTailDeleted, callFrame->thisValue(), scope, codeBlock, callFrame->callSiteIndex()));
 
             if (indexInLog < logCursorIndex