Title: [109802] trunk/Source/_javascript_Core
- Revision
- 109802
- Author
- [email protected]
- Date
- 2012-03-05 14:10:57 -0800 (Mon, 05 Mar 2012)
Log Message
Unreviewed, attempted build fix for !ENABLE(JIT) after r109705.
* bytecode/ExecutionCounter.cpp:
(JSC::ExecutionCounter::applyMemoryUsageHeuristics):
* bytecode/ExecutionCounter.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (109801 => 109802)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-05 22:01:15 UTC (rev 109801)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-05 22:10:57 UTC (rev 109802)
@@ -1,3 +1,11 @@
+2012-03-05 Filip Pizlo <[email protected]>
+
+ Unreviewed, attempted build fix for !ENABLE(JIT) after r109705.
+
+ * bytecode/ExecutionCounter.cpp:
+ (JSC::ExecutionCounter::applyMemoryUsageHeuristics):
+ * bytecode/ExecutionCounter.h:
+
2012-03-05 Patrick Gansterer <[email protected]>
Unreviewed. Build fix for !ENABLE(JIT) after r109705.
Modified: trunk/Source/_javascript_Core/bytecode/ExecutionCounter.cpp (109801 => 109802)
--- trunk/Source/_javascript_Core/bytecode/ExecutionCounter.cpp 2012-03-05 22:01:15 UTC (rev 109801)
+++ trunk/Source/_javascript_Core/bytecode/ExecutionCounter.cpp 2012-03-05 22:10:57 UTC (rev 109802)
@@ -26,8 +26,6 @@
#include "config.h"
#include "ExecutionCounter.h"
-#if ENABLE(JIT)
-
#include "CodeBlock.h"
#include "ExecutableAllocator.h"
#include <wtf/DataLog.h>
@@ -66,9 +64,15 @@
double ExecutionCounter::applyMemoryUsageHeuristics(int32_t value, CodeBlock* codeBlock)
{
+#if ENABLE(JIT)
double multiplier =
ExecutableAllocator::memoryPressureMultiplier(
codeBlock->predictedMachineCodeSize());
+#else
+ // This code path will probably not be taken, but if it is, we fake it.
+ double multiplier = 1.0;
+ UNUSED_PARAM(codeBlock);
+#endif
ASSERT(multiplier >= 1.0);
return multiplier * value;
}
@@ -159,4 +163,3 @@
} // namespace JSC
-#endif // ENABLE(JIT)
Modified: trunk/Source/_javascript_Core/bytecode/ExecutionCounter.h (109801 => 109802)
--- trunk/Source/_javascript_Core/bytecode/ExecutionCounter.h 2012-03-05 22:01:15 UTC (rev 109801)
+++ trunk/Source/_javascript_Core/bytecode/ExecutionCounter.h 2012-03-05 22:10:57 UTC (rev 109802)
@@ -26,8 +26,6 @@
#ifndef ExecutionCounter_h
#define ExecutionCounter_h
-#if ENABLE(JIT)
-
#include <wtf/SimpleStats.h>
namespace JSC {
@@ -81,7 +79,5 @@
} // namespace JSC
-#endif // ENABLE(JIT)
-
#endif // ExecutionCounter_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
