Changeset 195691 in webkit

Timestamp:

Jan 27, 2016 2:08:20 PM (8 years ago)

Author:

peavo@outlook.com

Message:

[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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ftl/FTLOSRExitCompiler.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp

@@ -568 +568 @@
     
     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
+        );
+#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(),
@@ -582 +586 @@
             toCString(ignoringContext<DumpContext>(exit.m_descriptor->m_values)).data(),
             toCString(*record).data())
-#endif // FTL_USES_B3
         );
+#endif // FTL_USES_B3
 }