Title: [97618] trunk/Source/_javascript_Core
- Revision
- 97618
- Author
- [email protected]
- Date
- 2011-10-17 07:03:19 -0700 (Mon, 17 Oct 2011)
Log Message
Interpreter build fix after r97564
* runtime/Executable.cpp:
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):
Moved declaration of globalData variable into ENABLE(JIT) blocks, since it is only used
there.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (97617 => 97618)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-17 14:01:35 UTC (rev 97617)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-17 14:03:19 UTC (rev 97618)
@@ -1,5 +1,15 @@
2011-10-17 Adam Roben <[email protected]>
+ Interpreter build fix after r97564
+
+ * runtime/Executable.cpp:
+ (JSC::FunctionExecutable::compileForCallInternal):
+ (JSC::FunctionExecutable::compileForConstructInternal):
+ Moved declaration of globalData variable into ENABLE(JIT) blocks, since it is only used
+ there.
+
+2011-10-17 Adam Roben <[email protected]>
+
Windows build fix after r97536, part 2
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: Added back
Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (97617 => 97618)
--- trunk/Source/_javascript_Core/runtime/Executable.cpp 2011-10-17 14:01:35 UTC (rev 97617)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp 2011-10-17 14:03:19 UTC (rev 97618)
@@ -440,10 +440,8 @@
#if !ENABLE(JIT)
UNUSED_PARAM(jitType);
#endif
- JSObject* exception;
- JSGlobalData* globalData = scopeChainNode->globalData;
-
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
+ JSObject* exception;
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(exec, scopeChainNode, !!m_codeBlockForCall ? OptimizingCompilation : FirstCompilation, CodeForCall, exception);
if (!newCodeBlock)
return exception;
@@ -457,6 +455,7 @@
m_symbolTable = m_codeBlockForCall->sharedSymbolTable();
#if ENABLE(JIT)
+ JSGlobalData* globalData = scopeChainNode->globalData;
if (globalData->canUseJIT()) {
bool dfgCompiled = false;
if (jitType == JITCode::DFGJIT)
@@ -501,10 +500,8 @@
{
UNUSED_PARAM(jitType);
- JSObject* exception;
- JSGlobalData* globalData = scopeChainNode->globalData;
-
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);
+ JSObject* exception;
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(exec, scopeChainNode, !!m_codeBlockForConstruct ? OptimizingCompilation : FirstCompilation, CodeForConstruct, exception);
if (!newCodeBlock)
return exception;
@@ -518,6 +515,7 @@
m_symbolTable = m_codeBlockForConstruct->sharedSymbolTable();
#if ENABLE(JIT)
+ JSGlobalData* globalData = scopeChainNode->globalData;
if (globalData->canUseJIT()) {
bool dfgCompiled = false;
if (jitType == JITCode::DFGJIT)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
