Title: [204856] trunk/Source/_javascript_Core
- Revision
- 204856
- Author
- [email protected]
- Date
- 2016-08-23 13:29:35 -0700 (Tue, 23 Aug 2016)
Log Message
Unreviewed, fix CLoop build.
This fixes the CLoop build while still ensuring that Interpreter.h is a project header.
* llint/LowLevelInterpreter.cpp:
* runtime/VM.cpp:
(JSC::VM::ensureStackCapacityForCLoop):
(JSC::VM::isSafeToRecurseSoftCLoop):
* runtime/VM.h:
* runtime/VMInlines.h:
(JSC::VM::ensureStackCapacityFor):
(JSC::VM::isSafeToRecurseSoft):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (204855 => 204856)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-23 20:29:35 UTC (rev 204856)
@@ -1,3 +1,18 @@
+2016-08-23 Filip Pizlo <[email protected]>
+
+ Unreviewed, fix CLoop build.
+
+ This fixes the CLoop build while still ensuring that Interpreter.h is a project header.
+
+ * llint/LowLevelInterpreter.cpp:
+ * runtime/VM.cpp:
+ (JSC::VM::ensureStackCapacityForCLoop):
+ (JSC::VM::isSafeToRecurseSoftCLoop):
+ * runtime/VM.h:
+ * runtime/VMInlines.h:
+ (JSC::VM::ensureStackCapacityFor):
+ (JSC::VM::isSafeToRecurseSoft):
+
2016-08-22 Filip Pizlo <[email protected]>
Butterflies should be allocated in Auxiliary MarkedSpace instead of CopiedSpace and we should rewrite as much of the GC as needed to make this not a regression
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp (204855 => 204856)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp 2016-08-23 20:29:35 UTC (rev 204856)
@@ -25,13 +25,17 @@
#include "config.h"
#include "LowLevelInterpreter.h"
+
#include "LLIntOfflineAsmConfig.h"
#include <wtf/InlineASM.h>
#if !ENABLE(JIT)
+#include "CLoopStackInlines.h"
#include "CodeBlock.h"
#include "CommonSlowPaths.h"
+#include "Interpreter.h"
#include "LLIntCLoop.h"
+#include "LLIntData.h"
#include "LLIntSlowPaths.h"
#include "JSCInlines.h"
#include <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/runtime/VM.cpp (204855 => 204856)
--- trunk/Source/_javascript_Core/runtime/VM.cpp 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/_javascript_Core/runtime/VM.cpp 2016-08-23 20:29:35 UTC (rev 204856)
@@ -108,6 +108,7 @@
#if !ENABLE(JIT)
#include "CLoopStack.h"
+#include "CLoopStackInlines.h"
#endif
#if ENABLE(DFG_JIT)
@@ -876,4 +877,16 @@
#endif
}
+#if !ENABLE(JIT)
+bool VM::ensureStackCapacityForCLoop(Register* newTopOfStack)
+{
+ return interpreter->cloopStack().ensureCapacityFor(newTopOfStack);
+}
+
+bool VM::isSafeToRecurseSoftCLoop() const
+{
+ return interpreter->cloopStack().isSafeToRecurse();
+}
+#endif // !ENABLE(JIT)
+
} // namespace JSC
Modified: trunk/Source/_javascript_Core/runtime/VM.h (204855 => 204856)
--- trunk/Source/_javascript_Core/runtime/VM.h 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2016-08-23 20:29:35 UTC (rev 204856)
@@ -644,6 +644,11 @@
m_lastException = exception;
}
+#if !ENABLE(JIT)
+ bool ensureStackCapacityForCLoop(Register* newTopOfStack);
+ bool isSafeToRecurseSoftCLoop() const;
+#endif // !ENABLE(JIT)
+
#if ENABLE(ASSEMBLER)
bool m_canUseAssembler;
#endif
Modified: trunk/Source/_javascript_Core/runtime/VMInlines.h (204855 => 204856)
--- trunk/Source/_javascript_Core/runtime/VMInlines.h 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/_javascript_Core/runtime/VMInlines.h 2016-08-23 20:29:35 UTC (rev 204856)
@@ -30,10 +30,6 @@
#include "VM.h"
#include "Watchdog.h"
-#if !ENABLE(JIT)
-#include "CLoopStackInlines.h"
-#endif
-
namespace JSC {
bool VM::ensureStackCapacityFor(Register* newTopOfStack)
@@ -42,7 +38,7 @@
ASSERT(wtfThreadData().stack().isGrowingDownward());
return newTopOfStack >= m_softStackLimit;
#else
- return interpreter->cloopStack().ensureCapacityFor(newTopOfStack);
+ return ensureStackCapacityForCLoop(newTopOfStack);
#endif
}
@@ -51,7 +47,7 @@
{
bool safe = isSafeToRecurse(m_softStackLimit);
#if !ENABLE(JIT)
- safe = safe && interpreter->cloopStack().isSafeToRecurse();
+ safe = safe && isSafeToRecurseSoftCLoop();
#endif
return safe;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
