Title: [153341] trunk/Source/_javascript_Core
- Revision
- 153341
- Author
- [email protected]
- Date
- 2013-07-25 13:22:45 -0700 (Thu, 25 Jul 2013)
Log Message
Make all jit & non-jit combos build cleanly
https://bugs.webkit.org/show_bug.cgi?id=119102
Reviewed by Anders Carlsson.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::counterValueForOptimizeSoon):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::optimizeAfterWarmUp):
(JSC::CodeBlock::numberOfDFGCompiles):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153340 => 153341)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-25 20:19:28 UTC (rev 153340)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-25 20:22:45 UTC (rev 153341)
@@ -1,5 +1,18 @@
2013-07-25 Oliver Hunt <[email protected]>
+ Make all jit & non-jit combos build cleanly
+ https://bugs.webkit.org/show_bug.cgi?id=119102
+
+ Reviewed by Anders Carlsson.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::counterValueForOptimizeSoon):
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::optimizeAfterWarmUp):
+ (JSC::CodeBlock::numberOfDFGCompiles):
+
+2013-07-25 Oliver Hunt <[email protected]>
+
32 bit portion of load validation logic
https://bugs.webkit.org/show_bug.cgi?id=118878
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (153340 => 153341)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2013-07-25 20:19:28 UTC (rev 153340)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2013-07-25 20:22:45 UTC (rev 153341)
@@ -3013,7 +3013,6 @@
optimizationThresholdScalingFactor() *
(1 << reoptimizationRetryCounter()));
}
-#endif
bool CodeBlock::checkIfOptimizationThresholdReached()
{
@@ -3108,6 +3107,8 @@
}
}
+#endif
+
static bool structureStubInfoLessThan(const StructureStubInfo& a, const StructureStubInfo& b)
{
return a.callReturnLocation.executableAddress() < b.callReturnLocation.executableAddress();
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (153340 => 153341)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2013-07-25 20:19:28 UTC (rev 153340)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2013-07-25 20:22:45 UTC (rev 153341)
@@ -792,7 +792,7 @@
// to avoid thrashing.
unsigned reoptimizationRetryCounter() const;
void countReoptimization();
-
+#if ENABLE(JIT)
unsigned numberOfDFGCompiles();
int32_t codeTypeThresholdMultiplier() const;
@@ -875,12 +875,14 @@
static ptrdiff_t offsetOfOSRExitCounter() { return OBJECT_OFFSETOF(CodeBlock, m_osrExitCounter); }
-#if ENABLE(JIT)
uint32_t adjustedExitCountThreshold(uint32_t desiredThreshold);
uint32_t exitCountThresholdForReoptimization();
uint32_t exitCountThresholdForReoptimizationFromLoop();
bool shouldReoptimizeNow();
bool shouldReoptimizeFromLoopNow();
+#else // No JIT
+ void optimizeAfterWarmUp() { }
+ unsigned numberOfDFGCompiles() { return 0; }
#endif
#if ENABLE(VALUE_PROFILER)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
