Changeset 234984 in webkit for trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h

Timestamp:

Aug 17, 2018, 8:26:19 AM (7 years ago)

Author:

[email protected]

Message:

[JSC] Add GPRReg::InvalidGPRReg and FPRReg::InvalidFPRReg
​https://bugs.webkit.org/show_bug.cgi?id=188589

Patch by Yusuke Suzuki <​[email protected]> and Fujii Hironori <Fujii Hironori> on 2018-08-17
Reviewed by Mark Lam.
And reviewed by Yusuke Suzuki for Hironori's change.

Source/JavaScriptCore:

Since GPRReg(RegisterID) and FPRReg(FPRegisterID) do not include -1 in their enum values,
UBSan dumps bunch of warnings "runtime error: load of value 4294967295, which is not a valid value for type 'RegisterID'".

• We add InvalidGPRReg and InvalidFPRReg to enum values of GPRReg and FPRReg to suppress the above warnings.
• We make GPRReg and FPRReg int8_t enums.
• We replace #define InvalidGPRReg ((JSC::GPRReg)-1) to static constexpr GPRReg InvalidGPRReg { GPRReg::InvalidGPRReg };.
• We add operator+/- definition for RegisterIDs as a MSVC workaround. MSVC fails to resolve operator+ and operator- if enum : int8_t is used instead of enum.

• assembler/ARM64Assembler.h:
• assembler/ARMAssembler.h:
• assembler/ARMv7Assembler.h:
• assembler/MIPSAssembler.h:
• assembler/MacroAssembler.h:
• assembler/X86Assembler.h:
• jit/CCallHelpers.h:

(JSC::CCallHelpers::clampArrayToSize):

• jit/FPRInfo.h:
• jit/GPRInfo.h:

(JSC::JSValueRegs::JSValueRegs):
(JSC::JSValueRegs::tagGPR const):
(JSC::JSValueRegs::payloadGPR const):
(JSC::JSValueSource::JSValueSource):
(JSC::JSValueSource::unboxedCell):
(JSC::JSValueSource::operator bool const):
(JSC::JSValueSource::base const):
(JSC::JSValueSource::tagGPR const):
(JSC::JSValueSource::payloadGPR const):
(JSC::JSValueSource::hasKnownTag const):

Source/WebCore:

• cssjit/FunctionCall.h:

(WebCore::FunctionCall::FunctionCall):

• cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):

• html/HTMLKeygenElement.cpp:

Remove using namespace WebCore not to introduce operator+/- which makes the resolution of operator+/- for RegisterID ambiguous.

File:

• trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h

@@ -40 +40 @@
 namespace ARMRegisters {
 
-    typedef enum {
+    typedef enum : int8_t {
         r0,
         r1,
@@ -64 +64 @@
         sp = r13,
         lr = r14,
-        pc = r15
+        pc = r15,
+        InvalidGPRReg = -1,
     } RegisterID;
 
-    typedef enum {
+    typedef enum : int8_t {
         apsr,
         fpscr
     } SPRegisterID;
 
-    typedef enum {
+    typedef enum : int8_t {
         s0,
         s1,
@@ -107 +108 @@
     } FPSingleRegisterID;
 
-    typedef enum {
+    typedef enum : int8_t {
         d0,
         d1,
@@ -142 +143 @@
         d31,
 #endif // CPU(ARM_NEON) || CPU(ARM_VFP_V3_D32)
+        InvalidFPRReg = -1,
     } FPDoubleRegisterID;
 
 #if CPU(ARM_NEON)
-    typedef enum {
+    typedef enum : int8_t {
         q0,
         q1,