Title: [243286] trunk/Source/_javascript_Core
- Revision
- 243286
- Author
- [email protected]
- Date
- 2019-03-21 03:35:58 -0700 (Thu, 21 Mar 2019)
Log Message
[JSC][32-bit] Build failure after r243232
https://bugs.webkit.org/show_bug.cgi?id=196068
Patch by Pablo Saavedra <[email protected]> on 2019-03-21
Reviewed by Mark Lam.
* dfg/DFGOSRExit.cpp:
(JSC::DFG::reifyInlinedCallFrames):
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::reifyInlinedCallFrames):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (243285 => 243286)
--- trunk/Source/_javascript_Core/ChangeLog 2019-03-21 10:10:35 UTC (rev 243285)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-03-21 10:35:58 UTC (rev 243286)
@@ -1,3 +1,15 @@
+2019-03-21 Pablo Saavedra <[email protected]>
+
+ [JSC][32-bit] Build failure after r243232
+ https://bugs.webkit.org/show_bug.cgi?id=196068
+
+ Reviewed by Mark Lam.
+
+ * dfg/DFGOSRExit.cpp:
+ (JSC::DFG::reifyInlinedCallFrames):
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+ (JSC::DFG::reifyInlinedCallFrames):
+
2019-03-21 Carlos Garcia Campos <[email protected]>
[GLib] Returning G_TYPE_OBJECT from a method does not work
Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExit.cpp (243285 => 243286)
--- trunk/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2019-03-21 10:10:35 UTC (rev 243285)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2019-03-21 10:35:58 UTC (rev 243286)
@@ -827,7 +827,7 @@
if (!inlineCallFrame->isClosureCall)
frame.setOperand(inlineCallFrame->stackOffset + CallFrameSlot::callee, JSValue(inlineCallFrame->calleeConstant()));
#else // USE(JSVALUE64) // so this is the 32-bit part
- const Instruction* instruction = baselineCodeBlock->instructions().at(codeOrigin->bytecodeIndex).ptr();
+ const Instruction* instruction = baselineCodeBlock->instructions().at(codeOrigin->bytecodeIndex()).ptr();
uint32_t locationBits = CallSiteIndex(instruction).bits();
frame.setOperand<uint32_t>(inlineCallFrame->stackOffset + CallFrameSlot::argumentCount, TagOffset, locationBits);
frame.setOperand<uint32_t>(inlineCallFrame->stackOffset + CallFrameSlot::callee, TagOffset, static_cast<uint32_t>(JSValue::CellTag));
@@ -841,7 +841,7 @@
#if USE(JSVALUE64)
uint32_t locationBits = CallSiteIndex(codeOrigin->bytecodeIndex()).bits();
#else
- const Instruction* instruction = outermostBaselineCodeBlock->instructions().at(codeOrigin->bytecodeIndex).ptr();
+ const Instruction* instruction = outermostBaselineCodeBlock->instructions().at(codeOrigin->bytecodeIndex()).ptr();
uint32_t locationBits = CallSiteIndex(instruction).bits();
#endif
frame.setOperand<uint32_t>(CallFrameSlot::argumentCount, TagOffset, locationBits);
Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (243285 => 243286)
--- trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2019-03-21 10:10:35 UTC (rev 243285)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2019-03-21 10:35:58 UTC (rev 243286)
@@ -237,7 +237,7 @@
jit.store64(AssemblyHelpers::TrustedImm64(JSValue::encode(JSValue(inlineCallFrame->calleeConstant()))), AssemblyHelpers::addressFor((VirtualRegister)(inlineCallFrame->stackOffset + CallFrameSlot::callee)));
#else // USE(JSVALUE64) // so this is the 32-bit part
jit.storePtr(callerFrameGPR, AssemblyHelpers::addressForByteOffset(inlineCallFrame->callerFrameOffset()));
- const Instruction* instruction = baselineCodeBlock->instructions().at(codeOrigin->bytecodeIndex).ptr();
+ const Instruction* instruction = baselineCodeBlock->instructions().at(codeOrigin->bytecodeIndex()).ptr();
uint32_t locationBits = CallSiteIndex(instruction).bits();
jit.store32(AssemblyHelpers::TrustedImm32(locationBits), AssemblyHelpers::tagFor((VirtualRegister)(inlineCallFrame->stackOffset + CallFrameSlot::argumentCount)));
jit.store32(AssemblyHelpers::TrustedImm32(JSValue::CellTag), AssemblyHelpers::tagFor((VirtualRegister)(inlineCallFrame->stackOffset + CallFrameSlot::callee)));
@@ -251,7 +251,7 @@
#if USE(JSVALUE64)
uint32_t locationBits = CallSiteIndex(codeOrigin->bytecodeIndex()).bits();
#else
- const Instruction* instruction = jit.baselineCodeBlock()->instructions().at(codeOrigin->bytecodeIndex).ptr();
+ const Instruction* instruction = jit.baselineCodeBlock()->instructions().at(codeOrigin->bytecodeIndex()).ptr();
uint32_t locationBits = CallSiteIndex(instruction).bits();
#endif
jit.store32(AssemblyHelpers::TrustedImm32(locationBits), AssemblyHelpers::tagFor((VirtualRegister)(CallFrameSlot::argumentCount)));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
