[Win][Clang] JITMathIC.h: error: missing 'template' keyword prior to dependent templa...

https://bugs.webkit.org/show_bug.cgi?id=189730

Reviewed by Saam Barati.

Clang for Windows can't compile the workaround for MSVC quirk in generateOutOfLine.

* jit/JITMathIC.h:
(generateOutOfLine): Append "&& !COMPILER(CLANG)" to "#if COMPILER(MSVC)".

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 163db4b..21f5909 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2018-09-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][Clang] JITMathIC.h: error: missing 'template' keyword prior to dependent template name 'retagged'
+        https://bugs.webkit.org/show_bug.cgi?id=189730
+
+        Reviewed by Saam Barati.
+
+        Clang for Windows can't compile the workaround for MSVC quirk in generateOutOfLine.
+
+        * jit/JITMathIC.h:
+        (generateOutOfLine): Append "&& !COMPILER(CLANG)" to "#if COMPILER(MSVC)".
+
 2018-09-19  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 
         [JSC] Optimize Array#indexOf in C++ runtime

diff --git a/Source/JavaScriptCore/jit/JITMathIC.h b/Source/JavaScriptCore/jit/JITMathIC.h
index 4e00958..6816792 100644 (file)
--- a/Source/JavaScriptCore/jit/JITMathIC.h
+++ b/Source/JavaScriptCore/jit/JITMathIC.h
@@ -144,7 +144,7 @@ public:
         };
 
         auto replaceCall = [&] () {
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) && !COMPILER(CLANG)
             ftlThunkAwareRepatchCall(codeBlock, slowPathCallLocation().retagged<JSInternalPtrTag>(), callReplacement);
 #else
             ftlThunkAwareRepatchCall(codeBlock, slowPathCallLocation().template retagged<JSInternalPtrTag>(), callReplacement);