Title: [238386] trunk/Source/_javascript_Core
Revision
238386
Author
hironori.fu...@sony.com
Date
2018-11-19 17:37:44 -0800 (Mon, 19 Nov 2018)

Log Message

[MSVC] X86Assembler.h(108): error C2666: 'WebCore::operator -': 7 overloads have similar conversions
https://bugs.webkit.org/show_bug.cgi?id=189467
<rdar://problem/44290945>

Reviewed by Mark Lam.

This issue has happened several times. And, it seems that it will
take more time for Microsoft to fix the MSVC bug. We need a
effective workaround not to repeat this issue until they fix MSVC.

Remove ": int8_t" of RegisterID only for COMPILER(MSVC).

* assembler/X86Assembler.h: Added JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE macro.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (238385 => 238386)


--- trunk/Source/_javascript_Core/ChangeLog	2018-11-20 01:15:15 UTC (rev 238385)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-11-20 01:37:44 UTC (rev 238386)
@@ -1,3 +1,19 @@
+2018-11-19  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [MSVC] X86Assembler.h(108): error C2666: 'WebCore::operator -': 7 overloads have similar conversions
+        https://bugs.webkit.org/show_bug.cgi?id=189467
+        <rdar://problem/44290945>
+
+        Reviewed by Mark Lam.
+
+        This issue has happened several times. And, it seems that it will
+        take more time for Microsoft to fix the MSVC bug. We need a
+        effective workaround not to repeat this issue until they fix MSVC.
+
+        Remove ": int8_t" of RegisterID only for COMPILER(MSVC).
+
+        * assembler/X86Assembler.h: Added JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE macro.
+
 2018-11-19  Yusuke Suzuki  <yusukesuz...@slowstart.org>
 
         [WebAssembly] I64 arguments / return value check should be moved from callWebAssemblyFunction to JSToWasm wrapper

Modified: trunk/Source/_javascript_Core/assembler/X86Assembler.h (238385 => 238386)


--- trunk/Source/_javascript_Core/assembler/X86Assembler.h	2018-11-20 01:15:15 UTC (rev 238385)
+++ trunk/Source/_javascript_Core/assembler/X86Assembler.h	2018-11-20 01:37:44 UTC (rev 238386)
@@ -41,7 +41,13 @@
 
 namespace X86Registers {
 
-typedef enum : int8_t {
+#if COMPILER(MSVC)
+#define JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE
+#else
+#define JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE : int8_t
+#endif
+
+typedef enum JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE {
     eax,
     ecx,
     edx,
@@ -63,12 +69,12 @@
     InvalidGPRReg = -1,
 } RegisterID;
 
-typedef enum : int8_t {
+typedef enum JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE {
     eip,
     eflags
 } SPRegisterID;
 
-typedef enum : int8_t {
+typedef enum JSC_X86_ASM_REGISTER_ID_ENUM_BASE_TYPE {
     xmm0,
     xmm1,
     xmm2,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to