Title: [156123] trunk/Source/_javascript_Core
Revision
156123
Author
[email protected]
Date
2013-09-19 15:23:39 -0700 (Thu, 19 Sep 2013)

Log Message

Unreviewed, fix Windows build. ScratchBuffer should always be available regardless of
ENABLE_DFG_JIT.

* runtime/VM.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (156122 => 156123)


--- trunk/Source/_javascript_Core/ChangeLog	2013-09-19 22:16:16 UTC (rev 156122)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-09-19 22:23:39 UTC (rev 156123)
@@ -1,3 +1,10 @@
+2013-09-19  Filip Pizlo  <[email protected]>
+
+        Unreviewed, fix Windows build. ScratchBuffer should always be available regardless of
+        ENABLE_DFG_JIT.
+
+        * runtime/VM.h:
+
 2013-09-19  Daniel Bates  <[email protected]>
 
         [iOS] Add more iOS logic to the _javascript_Core build configuration files

Modified: trunk/Source/_javascript_Core/runtime/VM.h (156122 => 156123)


--- trunk/Source/_javascript_Core/runtime/VM.h	2013-09-19 22:16:16 UTC (rev 156122)
+++ trunk/Source/_javascript_Core/runtime/VM.h	2013-09-19 22:23:39 UTC (rev 156123)
@@ -125,7 +125,6 @@
         double increment;
     };
 
-#if ENABLE(DFG_JIT)
     class ConservativeRoots;
 
 #if COMPILER(MSVC)
@@ -164,7 +163,6 @@
 #if COMPILER(MSVC)
 #pragma warning(pop)
 #endif
-#endif
 
     class VM : public ThreadSafeRefCounted<VM> {
     public:
@@ -354,7 +352,6 @@
         ExecState* callFrameForThrow;
         void* targetMachinePCForThrow;
         Instruction* targetInterpreterPCForThrow;
-#if ENABLE(DFG_JIT)
         uint32_t osrExitIndex;
         void* osrExitJumpDestination;
         Vector<ScratchBuffer*> scratchBuffers;
@@ -381,7 +378,6 @@
         }
 
         void gatherConservativeRoots(ConservativeRoots&);
-#endif
 
         JSGlobalObject* dynamicGlobalObject;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to