Changeset 250775 in webkit for trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

Timestamp:

Oct 7, 2019, 9:47:30 AM (6 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r250750.

Reverting change as this broke interal test over the weekend.

Reverted changeset:

"Allow OSR exit to the LLInt"
​https://bugs.webkit.org/show_bug.cgi?id=197993
​https://trac.webkit.org/changeset/250750

File:

• trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (modified) (6 diffs)

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -1326 +1326 @@
 end)
 
+
 llintOpWithMetadata(op_get_by_id, OpGetById, macro (size, get, dispatch, metadata, return)
     metadata(t2, t1)
@@ -1376 +1377 @@
     callSlowPath(_llint_slow_path_get_by_id)
     dispatch()
-
-# osr return point
-    getterSetterOSRExitReturnPoint(op_get_by_id, size)
-    metadata(t2, t3)
-    valueProfile(OpGetById, t2, r0)
-    return(r0)
-
 end)
 
@@ -1455 +1449 @@
     callSlowPath(_llint_slow_path_put_by_id)
     dispatch()
-
-# osr return point
-    getterSetterOSRExitReturnPoint(op_put_by_id, size)
-    dispatch()
-
 end)
 
@@ -1631 +1620 @@
     callSlowPath(_llint_slow_path_get_by_val)
     dispatch()
-
-# osr return point
-    getterSetterOSRExitReturnPoint(op_get_by_val, size)
-    metadata(t5, t2)
-    valueProfile(OpGetByVal, t5, r0)
-    return(r0)
-
-end)
-
-
-macro putByValOp(opcodeName, opcodeStruct, osrExitPoint)
+end)
+
+
+macro putByValOp(opcodeName, opcodeStruct)
     llintOpWithMetadata(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, metadata, return)
         macro contiguousPutByVal(storeCallback)
@@ -1729 +1711 @@
         callSlowPath(_llint_slow_path_%opcodeName%)
         dispatch()
-
-        osrExitPoint(size, dispatch)
-        
     end)
 end
 
-putByValOp(put_by_val, OpPutByVal, macro (size, dispatch)
-    # osr return point
-    getterSetterOSRExitReturnPoint(op_put_by_val, size)
-    dispatch()
-end)
-
-putByValOp(put_by_val_direct, OpPutByValDirect, macro (a, b) end)
+putByValOp(put_by_val, OpPutByVal)
+
+putByValOp(put_by_val_direct, OpPutByValDirect)
 
 
@@ -2030 +2005 @@
         move t3, sp
         prepareCall(%opcodeStruct%::Metadata::m_callLinkInfo.m_machineCodeTarget[t5], t2, t3, t4, JSEntryPtrTag)
-        callTargetFunction(opcodeName, size, opcodeStruct, dispatch, %opcodeStruct%::Metadata::m_callLinkInfo.m_machineCodeTarget[t5], JSEntryPtrTag)
+        callTargetFunction(size, opcodeStruct, dispatch, %opcodeStruct%::Metadata::m_callLinkInfo.m_machineCodeTarget[t5], JSEntryPtrTag)
 
     .opCallSlow:
-        slowPathForCall(opcodeName, size, opcodeStruct, dispatch, slowPath, prepareCall)
+        slowPathForCall(size, opcodeStruct, dispatch, slowPath, prepareCall)
     end)
 end