Title: [95225] trunk/Source/_javascript_Core
- Revision
- 95225
- Author
- fpi...@apple.com
- Date
- 2011-09-15 14:00:40 -0700 (Thu, 15 Sep 2011)
Log Message
Unreviewed build fix for platforms that expect a linkable symbol
for primitive static const's.
* bytecode/CodeBlock.h:
* jit/JIT.cpp:
(JSC::JIT::emitOptimizationCheck):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95224 => 95225)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-15 20:57:58 UTC (rev 95224)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-15 21:00:40 UTC (rev 95225)
@@ -1,5 +1,14 @@
2011-09-15 Filip Pizlo <fpi...@apple.com>
+ Unreviewed build fix for platforms that expect a linkable symbol
+ for primitive static const's.
+
+ * bytecode/CodeBlock.h:
+ * jit/JIT.cpp:
+ (JSC::JIT::emitOptimizationCheck):
+
+2011-09-15 Filip Pizlo <fpi...@apple.com>
+
Unreviewed build fix for assertion on existence of alternative
CodeBlock.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (95224 => 95225)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2011-09-15 20:57:58 UTC (rev 95224)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2011-09-15 21:00:40 UTC (rev 95225)
@@ -690,8 +690,8 @@
}
// The amount by which the JIT will increment m_executeCounter.
- static const unsigned executeCounterIncrementForLoop = 1;
- static const unsigned executeCounterIncrementForReturn = 15;
+ static unsigned executeCounterIncrementForLoop() { return 1; }
+ static unsigned executeCounterIncrementForReturn() { return 15; }
#if ENABLE(VALUE_PROFILER)
bool shouldOptimizeNow();
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (95224 => 95225)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2011-09-15 20:57:58 UTC (rev 95224)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2011-09-15 21:00:40 UTC (rev 95225)
@@ -99,7 +99,7 @@
if (!shouldEmitProfiling())
return;
- Jump skipOptimize = branchAdd32(Signed, TrustedImm32(kind == LoopOptimizationCheck ? CodeBlock::executeCounterIncrementForLoop : CodeBlock::executeCounterIncrementForReturn), AbsoluteAddress(m_codeBlock->addressOfExecuteCounter()));
+ Jump skipOptimize = branchAdd32(Signed, TrustedImm32(kind == LoopOptimizationCheck ? CodeBlock::executeCounterIncrementForLoop() : CodeBlock::executeCounterIncrementForReturn()), AbsoluteAddress(m_codeBlock->addressOfExecuteCounter()));
JITStubCall stubCall(this, kind == LoopOptimizationCheck ? cti_optimize_from_loop : cti_optimize_from_ret);
if (kind == LoopOptimizationCheck)
stubCall.addArgument(Imm32(m_bytecodeOffset));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
