Title: [118290] trunk/Source/_javascript_Core
Revision
118290
Author
[email protected]
Date
2012-05-23 18:04:55 -0700 (Wed, 23 May 2012)

Log Message

Unreviewed, fix Windows build.

* bytecode/CodeBlock.h:
* dfg/DFGCapabilities.h:
(JSC::DFG::canCompileOpcode):
(JSC::DFG::canCompileOpcodes):
* dfg/DFGCommon.h:
(DFG):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (118289 => 118290)


--- trunk/Source/_javascript_Core/ChangeLog	2012-05-24 01:00:50 UTC (rev 118289)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-05-24 01:04:55 UTC (rev 118290)
@@ -1,5 +1,16 @@
 2012-05-23  Filip Pizlo  <[email protected]>
 
+        Unreviewed, fix Windows build.
+
+        * bytecode/CodeBlock.h:
+        * dfg/DFGCapabilities.h:
+        (JSC::DFG::canCompileOpcode):
+        (JSC::DFG::canCompileOpcodes):
+        * dfg/DFGCommon.h:
+        (DFG):
+
+2012-05-23  Filip Pizlo  <[email protected]>
+
         DFG should optimize inlined uses of arguments.length and arguments[i]
         https://bugs.webkit.org/show_bug.cgi?id=86327
 

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (118289 => 118290)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2012-05-24 01:00:50 UTC (rev 118289)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2012-05-24 01:04:55 UTC (rev 118290)
@@ -37,6 +37,7 @@
 #include "CodeType.h"
 #include "CompactJITCodeMap.h"
 #include "DFGCodeBlocks.h"
+#include "DFGCommon.h"
 #include "DFGExitProfile.h"
 #include "DFGOSREntry.h"
 #include "DFGOSRExit.h"

Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.h (118289 => 118290)


--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.h	2012-05-24 01:00:50 UTC (rev 118289)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.h	2012-05-24 01:04:55 UTC (rev 118290)
@@ -227,9 +227,9 @@
 inline bool mightInlineFunctionForCall(CodeBlock*) { return false; }
 inline bool mightInlineFunctionForConstruct(CodeBlock*) { return false; }
 
-inline CapabilityLevel canCompileOpcode(OpcodeID, CodeBlock*, Instruction*) { return false; }
+inline CapabilityLevel canCompileOpcode(OpcodeID, CodeBlock*, Instruction*) { return CannotCompile; }
 inline bool canInlineOpcode(OpcodeID, CodeBlock*, Instruction*) { return false; }
-inline CapabilityLevel canCompileOpcodes(CodeBlock*) { return false; }
+inline CapabilityLevel canCompileOpcodes(CodeBlock*) { return CannotCompile; }
 inline bool canInlineOpcodes(CodeBlock*) { return false; }
 #endif // ENABLE(DFG_JIT)
 

Modified: trunk/Source/_javascript_Core/dfg/DFGCommon.h (118289 => 118290)


--- trunk/Source/_javascript_Core/dfg/DFGCommon.h	2012-05-24 01:00:50 UTC (rev 118289)
+++ trunk/Source/_javascript_Core/dfg/DFGCommon.h	2012-05-24 01:04:55 UTC (rev 118290)
@@ -130,11 +130,17 @@
 
 enum NoResultTag { NoResult };
 
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)
+
+namespace JSC { namespace DFG {
+
+// Put things here that must be defined even if ENABLE(DFG_JIT) is false.
+
 enum CapabilityLevel { CannotCompile, ShouldProfile, CanCompile, CapabilityLevelNotSet };
 
 } } // namespace JSC::DFG
 
-#endif // ENABLE(DFG_JIT)
-
 #endif // DFGCommon_h
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to