Changeset 243907 in webkit

Timestamp:

Apr 4, 2019, 2:39:16 PM (7 years ago)

Author:

sbarati@apple.com

Message:

Unreviewed, build fix for CLoop after r243886

• interpreter/Interpreter.cpp:

(JSC::UnwindFunctor::copyCalleeSavesToEntryFrameCalleeSavesBuffer const):

• interpreter/StackVisitor.cpp:

(JSC::StackVisitor::Frame::calleeSaveRegistersForUnwinding):

• interpreter/StackVisitor.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)
• interpreter/StackVisitor.cpp (modified) (2 diffs)
• interpreter/StackVisitor.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-04  Saam Barati  <sbarati@apple.com>
+
+        Unreviewed, build fix for CLoop after r243886
+
+        * interpreter/Interpreter.cpp:
+        (JSC::UnwindFunctor::copyCalleeSavesToEntryFrameCalleeSavesBuffer const):
+        * interpreter/StackVisitor.cpp:
+        (JSC::StackVisitor::Frame::calleeSaveRegistersForUnwinding):
+        * interpreter/StackVisitor.h:
+
 2019-04-04  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -571 +571 @@
     void copyCalleeSavesToEntryFrameCalleeSavesBuffer(StackVisitor& visitor) const
     {
-#if !ENABLE(C_LOOP) && NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
+#if ENABLE(ASSEMBLER)
         Optional<RegisterAtOffsetList> currentCalleeSaves = visitor->calleeSaveRegistersForUnwinding();
 

trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp

@@ -254 +254 @@
 }
 
+#if ENABLE(ASSEMBLER)
 Optional<RegisterAtOffsetList> StackVisitor::Frame::calleeSaveRegistersForUnwinding()
 {
+    if (!NUMBER_OF_CALLEE_SAVES_REGISTERS)
+        return WTF::nullopt;
+
     if (isInlinedFrame())
         return WTF::nullopt;
-
-#if !ENABLE(C_LOOP) && NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
 
 #if ENABLE(WEBASSEMBLY)
@@ -280 +282 @@
         return *codeBlock->calleeSaveRegisters();
 
-#endif // !ENABLE(C_LOOP) && NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
-
     return WTF::nullopt;
 }
+#endif // ENABLE(ASSEMBLER)
 
 String StackVisitor::Frame::functionName() const

trunk/Source/JavaScriptCore/interpreter/StackVisitor.h

@@ -95 +95 @@
         JS_EXPORT_PRIVATE void computeLineAndColumn(unsigned& line, unsigned& column) const;
 
+#if ENABLE(ASSEMBLER)
         Optional<RegisterAtOffsetList> calleeSaveRegistersForUnwinding();
+#endif
 
         ClonedArguments* createArguments();