Gardening: fix Windows build.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Aug 2017 16:41:47 +0000 (16:41 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Aug 2017 16:41:47 +0000 (16:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175446

Not reviewed.

* assembler/MacroAssemblerX86Common.cpp:
(JSC::booleanTrueForAvoidingNoReturnDeclaration):
(JSC::ctiMasmProbeTrampoline):

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp

index 7680553..5ea19f3 100644 (file)
@@ -1,3 +1,14 @@
+2017-08-14  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: fix Windows build.
+        https://bugs.webkit.org/show_bug.cgi?id=175446
+
+        Not reviewed.
+
+        * assembler/MacroAssemblerX86Common.cpp:
+        (JSC::booleanTrueForAvoidingNoReturnDeclaration):
+        (JSC::ctiMasmProbeTrampoline):
+
 2017-08-12  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         [ARM64] Use x29 and x30 instead of fp and lr to make GCC happy
index 9491a3e..a7fe01a 100644 (file)
@@ -523,9 +523,12 @@ asm (
 #endif // COMPILER(GCC_OR_CLANG)
 
 #if OS(WINDOWS)
-extern "C" NO_RETURN_DUE_TO_ASSERT void ctiMasmProbeTrampoline()
+static bool booleanTrueForAvoidingNoReturnDeclaration() { return true; }
+
+extern "C" void ctiMasmProbeTrampoline()
 {
-    RELEASE_ASSERT_NOT_REACHED();
+    if (booleanTrueForAvoidingNoReturnDeclaration())
+        RELEASE_ASSERT_NOT_REACHED();
 }
 #endif // OS(WINDOWS)