[FTL][Win64] Compile fix.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jan 2016 22:08:20 +0000 (22:08 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jan 2016 22:08:20 +0000 (22:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153555

Reviewed by Alex Christensen.

MSVC does not accept preprocessor conditionals in macros.

* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileStub):

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp

index dfbfc7e..10c048c 100644 (file)
@@ -1,3 +1,15 @@
+2016-01-27  Per Arne Vollan  <peavo@outlook.com>
+
+        [FTL][Win64] Compile fix.
+        https://bugs.webkit.org/show_bug.cgi?id=153555
+
+        Reviewed by Alex Christensen.
+
+        MSVC does not accept preprocessor conditionals in macros.
+
+        * ftl/FTLOSRExitCompiler.cpp:
+        (JSC::FTL::compileStub):
+
 2016-01-27  Filip Pizlo  <fpizlo@apple.com>
 
         Air::TmpWidth uses a stale pointer into its HashMap after it calls add()
index c388679..8c9194c 100644 (file)
@@ -567,22 +567,26 @@ static void compileStub(
     adjustAndJumpToTarget(jit, exit, exit.m_isExceptionHandler);
     
     LinkBuffer patchBuffer(*vm, jit, codeBlock);
+#if FTL_USES_B3
     exit.m_code = FINALIZE_CODE_IF(
         shouldDumpDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit(),
         patchBuffer,
-#if FTL_USES_B3
         ("FTL OSR exit #%u (%s, %s) from %s, with operands = %s",
             exitID, toCString(exit.m_codeOrigin).data(),
             exitKindToString(exit.m_kind), toCString(*codeBlock).data(),
             toCString(ignoringContext<DumpContext>(exit.m_descriptor->m_values)).data())
+        );
 #else // FTL_USES_B3
+    exit.m_code = FINALIZE_CODE_IF(
+        shouldDumpDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit(),
+        patchBuffer,
         ("FTL OSR exit #%u (%s, %s) from %s, with operands = %s, and record = %s",
             exitID, toCString(exit.m_codeOrigin).data(),
             exitKindToString(exit.m_kind), toCString(*codeBlock).data(),
             toCString(ignoringContext<DumpContext>(exit.m_descriptor->m_values)).data(),
             toCString(*record).data())
-#endif // FTL_USES_B3
         );
+#endif // FTL_USES_B3
 }
 
 extern "C" void* compileFTLOSRExit(ExecState* exec, unsigned exitID)