Title: [243907] trunk/Source/_javascript_Core
- Revision
- 243907
- Author
- [email protected]
- Date
- 2019-04-04 14:39:16 -0700 (Thu, 04 Apr 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (243906 => 243907)
--- trunk/Source/_javascript_Core/ChangeLog 2019-04-04 21:13:26 UTC (rev 243906)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-04-04 21:39:16 UTC (rev 243907)
@@ -1,3 +1,13 @@
+2019-04-04 Saam Barati <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r243898.
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (243906 => 243907)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2019-04-04 21:13:26 UTC (rev 243906)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2019-04-04 21:39:16 UTC (rev 243907)
@@ -570,7 +570,7 @@
private:
void copyCalleeSavesToEntryFrameCalleeSavesBuffer(StackVisitor& visitor) const
{
-#if !ENABLE(C_LOOP) && NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
+#if ENABLE(ASSEMBLER)
Optional<RegisterAtOffsetList> currentCalleeSaves = visitor->calleeSaveRegistersForUnwinding();
if (!currentCalleeSaves)
Modified: trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp (243906 => 243907)
--- trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp 2019-04-04 21:13:26 UTC (rev 243906)
+++ trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp 2019-04-04 21:39:16 UTC (rev 243907)
@@ -253,13 +253,15 @@
return CodeType::Global;
}
+#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)
if (isWasmFrame()) {
if (callee().isCell()) {
@@ -279,10 +281,9 @@
if (CodeBlock* codeBlock = this->codeBlock())
return *codeBlock->calleeSaveRegisters();
-#endif // !ENABLE(C_LOOP) && NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
-
return WTF::nullopt;
}
+#endif // ENABLE(ASSEMBLER)
String StackVisitor::Frame::functionName() const
{
Modified: trunk/Source/_javascript_Core/interpreter/StackVisitor.h (243906 => 243907)
--- trunk/Source/_javascript_Core/interpreter/StackVisitor.h 2019-04-04 21:13:26 UTC (rev 243906)
+++ trunk/Source/_javascript_Core/interpreter/StackVisitor.h 2019-04-04 21:39:16 UTC (rev 243907)
@@ -94,7 +94,9 @@
bool hasLineAndColumnInfo() const;
JS_EXPORT_PRIVATE void computeLineAndColumn(unsigned& line, unsigned& column) const;
+#if ENABLE(ASSEMBLER)
Optional<RegisterAtOffsetList> calleeSaveRegistersForUnwinding();
+#endif
ClonedArguments* createArguments();
CallFrame* callFrame() const { return m_callFrame; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
