Unreviewed, fix Windows build. ScratchBuffer should always be available regardless of
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Sep 2013 22:23:39 +0000 (22:23 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Sep 2013 22:23:39 +0000 (22:23 +0000)
ENABLE_DFG_JIT.

* runtime/VM.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/VM.h

index 885d130..fbfac7f 100644 (file)
@@ -1,3 +1,10 @@
+2013-09-19  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, fix Windows build. ScratchBuffer should always be available regardless of
+        ENABLE_DFG_JIT.
+
+        * runtime/VM.h:
+
 2013-09-19  Daniel Bates  <dabates@apple.com>
 
         [iOS] Add more iOS logic to the JavaScriptCore build configuration files
index 3577ffa..8dc25ad 100644 (file)
@@ -125,7 +125,6 @@ namespace JSC {
         double increment;
     };
 
-#if ENABLE(DFG_JIT)
     class ConservativeRoots;
 
 #if COMPILER(MSVC)
@@ -164,7 +163,6 @@ namespace JSC {
 #if COMPILER(MSVC)
 #pragma warning(pop)
 #endif
-#endif
 
     class VM : public ThreadSafeRefCounted<VM> {
     public:
@@ -354,7 +352,6 @@ namespace JSC {
         ExecState* callFrameForThrow;
         void* targetMachinePCForThrow;
         Instruction* targetInterpreterPCForThrow;
-#if ENABLE(DFG_JIT)
         uint32_t osrExitIndex;
         void* osrExitJumpDestination;
         Vector<ScratchBuffer*> scratchBuffers;
@@ -381,7 +378,6 @@ namespace JSC {
         }
 
         void gatherConservativeRoots(ConservativeRoots&);
-#endif
 
         JSGlobalObject* dynamicGlobalObject;