Changeset 209678 in webkit for trunk/Source/JavaScriptCore/jit/CachedRecovery.h

Timestamp:

Dec 10, 2016, 5:14:37 PM (8 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/jit/CachedRecovery.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/CachedRecovery.h

@@ -51 +51 @@
 
     const Vector<VirtualRegister, 1>& targets() const { return m_targets; }
-    const Vector<JSValueRegs, 1>& gprTargets() const { return m_gprTargets; }
 
     void addTarget(VirtualRegister reg)
@@ -70 +69 @@
     }
 
-    void addTargetJSValueRegs(JSValueRegs);
+    void setWantedJSValueRegs(JSValueRegs jsValueRegs)
+    {
+        ASSERT(m_wantedFPR == InvalidFPRReg);
+        m_wantedJSValueRegs = jsValueRegs;
+    }
 
     void setWantedFPR(FPRReg fpr)
     {
-        ASSERT(m_gprTargets.isEmpty());
+        ASSERT(!m_wantedJSValueRegs);
         m_wantedFPR = fpr;
     }
@@ -117 +120 @@
     void setRecovery(ValueRecovery recovery) { m_recovery = recovery; }
 
-    JSValueRegs wantedJSValueRegs() const
-    {
-        if (m_gprTargets.isEmpty())
-            return JSValueRegs();
-
-        return m_gprTargets[0];
-    }
+    JSValueRegs wantedJSValueRegs() const { return m_wantedJSValueRegs; }
 
     FPRReg wantedFPR() const { return m_wantedFPR; }
 private:
     ValueRecovery m_recovery;
+    JSValueRegs m_wantedJSValueRegs;
     FPRReg m_wantedFPR { InvalidFPRReg };
     Vector<VirtualRegister, 1> m_targets;
-    Vector<JSValueRegs, 1> m_gprTargets;
 };