Changeset 224258 in webkit for trunk/Source/JavaScriptCore/bytecode/InlineAccess.cpp

Timestamp:

Oct 31, 2017, 4:12:32 PM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r224243, r224246, and r224248.
​https://bugs.webkit.org/show_bug.cgi?id=179083

The patch and fix broke the Windows build. (Requested by
mlewis13 on #webkit).

Reverted changesets:

"StructureStubInfo should have GPRReg members not int8_ts"
​https://bugs.webkit.org/show_bug.cgi?id=179071
​https://trac.webkit.org/changeset/224243

"Make all register enums be backed by uint8_t."
​https://bugs.webkit.org/show_bug.cgi?id=179074
​https://trac.webkit.org/changeset/224246

"Unreviewed, windows build fix."
​https://trac.webkit.org/changeset/224248

File:

• trunk/Source/JavaScriptCore/bytecode/InlineAccess.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/InlineAccess.cpp

@@ -162 +162 @@
     CCallHelpers jit;
     
-    GPRReg base = stubInfo.patch.baseGPR;
+    GPRReg base = static_cast<GPRReg>(stubInfo.patch.baseGPR);
     JSValueRegs value = stubInfo.valueRegs();
 
@@ -190 +190 @@
 {
     ScratchRegisterAllocator allocator(stubInfo.patch.usedRegisters);
-    allocator.lock(stubInfo.patch.baseGPR);
-    allocator.lock(stubInfo.patch.valueGPR);
+    allocator.lock(static_cast<GPRReg>(stubInfo.patch.baseGPR));
+    allocator.lock(static_cast<GPRReg>(stubInfo.patch.valueGPR));
 #if USE(JSVALUE32_64)
-    allocator.lock(stubInfo.patch.baseTagGPR);
-    allocator.lock(stubInfo.patch.valueTagGPR);
+    allocator.lock(static_cast<GPRReg>(stubInfo.patch.baseTagGPR));
+    allocator.lock(static_cast<GPRReg>(stubInfo.patch.valueTagGPR));
 #endif
     GPRReg scratch = allocator.allocateScratchGPR();