Title: [94616] trunk/Source/_javascript_Core
Revision
94616
Author
[email protected]
Date
2011-09-06 16:36:51 -0700 (Tue, 06 Sep 2011)

Log Message

Unreviewed build fix for r94559.
        
Marked the relevant parameters as unused if !ENABLE(JIT), and surrounded
new out-of-line JIT-specific method definitions with !ENABLE(JIT).

* bytecode/CodeBlock.cpp:
* runtime/Executable.cpp:
(JSC::EvalExecutable::compileInternal):
(JSC::ProgramExecutable::compileInternal):
(JSC::FunctionExecutable::compileForCallInternal):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (94615 => 94616)


--- trunk/Source/_javascript_Core/ChangeLog	2011-09-06 23:30:13 UTC (rev 94615)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-06 23:36:51 UTC (rev 94616)
@@ -1,3 +1,16 @@
+2011-09-06  Filip Pizlo  <[email protected]>
+
+        Unreviewed build fix for r94559.
+        
+        Marked the relevant parameters as unused if !ENABLE(JIT), and surrounded
+        new out-of-line JIT-specific method definitions with !ENABLE(JIT).
+
+        * bytecode/CodeBlock.cpp:
+        * runtime/Executable.cpp:
+        (JSC::EvalExecutable::compileInternal):
+        (JSC::ProgramExecutable::compileInternal):
+        (JSC::FunctionExecutable::compileForCallInternal):
+
 2011-09-06  Mark Hahnenberg  <[email protected]>
 
         Fix broken PPC build due to new dtoa library

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (94615 => 94616)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2011-09-06 23:30:13 UTC (rev 94615)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2011-09-06 23:36:51 UTC (rev 94616)
@@ -1867,6 +1867,7 @@
     replaceExistingEntries(m_functionExprs, m_alternative->m_functionExprs);
 }
 
+#if ENABLE(JIT)
 // FIXME: Implement OSR. If compileOptimized() is called from somewhere other than the
 // epilogue, do OSR from the old code block to the new one.
 
@@ -1924,5 +1925,6 @@
     JSObject* error = static_cast<FunctionExecutable*>(ownerExecutable())->compileOptimizedFor(exec, scopeChainNode, m_isConstructor ? CodeForConstruct : CodeForCall);
     return error;
 }
+#endif
 
 } // namespace JSC

Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (94615 => 94616)


--- trunk/Source/_javascript_Core/runtime/Executable.cpp	2011-09-06 23:30:13 UTC (rev 94615)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp	2011-09-06 23:36:51 UTC (rev 94616)
@@ -129,6 +129,9 @@
 
 JSObject* EvalExecutable::compileInternal(ExecState* exec, ScopeChainNode* scopeChainNode, JITCode::JITType jitType)
 {
+#if !ENABLE(JIT)
+    UNUSED_PARAM(jitType);
+#endif
     JSObject* exception = 0;
     JSGlobalData* globalData = &exec->globalData();
     JSGlobalObject* lexicalGlobalObject = exec->lexicalGlobalObject();
@@ -249,6 +252,9 @@
 
 JSObject* ProgramExecutable::compileInternal(ExecState* exec, ScopeChainNode* scopeChainNode, JITCode::JITType jitType)
 {
+#if !ENABLE(JIT)
+    UNUSED_PARAM(jitType);
+#endif
     JSObject* exception = 0;
     JSGlobalData* globalData = &exec->globalData();
     JSGlobalObject* lexicalGlobalObject = exec->lexicalGlobalObject();
@@ -365,6 +371,9 @@
 
 JSObject* FunctionExecutable::compileForCallInternal(ExecState* exec, ScopeChainNode* scopeChainNode, ExecState* calleeArgsExec, JITCode::JITType jitType)
 {
+#if !ENABLE(JIT)
+    UNUSED_PARAM(jitType);
+#endif
     JSObject* exception = 0;
     JSGlobalData* globalData = scopeChainNode->globalData;
     RefPtr<FunctionBodyNode> body = globalData->parser->parse<FunctionBodyNode>(exec->lexicalGlobalObject(), 0, 0, m_source, m_parameters.get(), isStrictMode() ? JSParseStrict : JSParseNormal, &exception);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to