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

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/jit/JITCode.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/jit/JITCode.h

@@ -26 +26 @@
 #pragma once
 
+#include "ArityCheckMode.h"
 #include "CallFrame.h"
 #include "CodeOrigin.h"
 #include "Disassembler.h"
-#include "JITEntryPoints.h"
 #include "JSCJSValue.h"
 #include "MacroAssemblerCodeRef.h"
@@ -174 +174 @@
     }
     
-    virtual CodePtr addressForCall(EntryPointType) = 0;
+    virtual CodePtr addressForCall(ArityCheckMode) = 0;
     virtual void* executableAddressAtOffset(size_t offset) = 0;
+    void* executableAddress() { return executableAddressAtOffset(0); }
     virtual void* dataAddressAtOffset(size_t offset) = 0;
     virtual unsigned offsetOf(void* pointerIntoCode) = 0;
@@ -224 +225 @@
 public:
     DirectJITCode(JITType);
-    DirectJITCode(JITEntryPointsWithRef, JITType);
+    DirectJITCode(CodeRef, CodePtr withArityCheck, JITType);
     virtual ~DirectJITCode();
     
-    void initializeEntryPoints(JITEntryPointsWithRef);
-
-    CodePtr addressForCall(EntryPointType) override;
+    void initializeCodeRef(CodeRef, CodePtr withArityCheck);
+
+    CodePtr addressForCall(ArityCheckMode) override;
 
 private:
-    JITEntryPoints m_entryPoints;
+    CodePtr m_withArityCheck;
 };
 
@@ -243 +244 @@
     void initializeCodeRef(CodeRef);
 
-    CodePtr addressForCall(EntryPointType) override;
+    CodePtr addressForCall(ArityCheckMode) override;
 };