Remove common handler for access by slot index

Summary: Simplify the interpreter control flow since these are relatively simple operations. Reviewed By: dannysu Differential Revision: D68188202 fbshipit-source-id: 3a49b8d2572c2189b430b18dfba7eb0b67be6155
facebook · Jan 31, 2025 · 6bf2a6a · 6bf2a6a
1 parent b211d9a
commit 6bf2a6a
Showing 1 changed file with 38 additions and 30 deletions.
diff --git a/lib/VM/Interpreter.cpp b/lib/VM/Interpreter.cpp
@@ -3563,43 +3563,51 @@ CallResult<HermesValue> Interpreter::interpretFunction(
       DISPATCH;
     }
       CASE(PutOwnBySlotIdxLong) {
-        nextIP = NEXTINST(PutOwnBySlotIdxLong);
-        idVal = ip->iPutOwnBySlotIdxLong.op3;
-        goto putOwnBySlotIdx;
+        assert(
+            O1REG(PutOwnBySlotIdxLong).isObject() &&
+            "Object argument of PutOwnBySlotIdx must be an object");
+        ENCODE_HV_AS_SHV(shv, O2REG(PutOwnBySlotIdxLong));
+        JSObject::setNamedSlotValueUnsafe(
+            vmcast<JSObject>(O1REG(PutOwnBySlotIdxLong)),
+            runtime,
+            ip->iPutOwnBySlotIdxLong.op3,
+            shv);
+        ip = NEXTINST(PutOwnBySlotIdxLong);
+        DISPATCH;
       }
       CASE(PutOwnBySlotIdx) {
-        nextIP = NEXTINST(PutOwnBySlotIdx);
-        idVal = ip->iPutOwnBySlotIdx.op3;
+        assert(
+            O1REG(PutOwnBySlotIdx).isObject() &&
+            "Object argument of PutOwnBySlotIdx must be an object");
+        ENCODE_HV_AS_SHV(shv, O2REG(PutOwnBySlotIdx));
+        JSObject::setNamedSlotValueUnsafe(
+            vmcast<JSObject>(O1REG(PutOwnBySlotIdx)),
+            runtime,
+            ip->iPutOwnBySlotIdx.op3,
+            shv);
+        ip = NEXTINST(PutOwnBySlotIdx);
+        DISPATCH;
       }
-    putOwnBySlotIdx: {
-      assert(
-          O1REG(PutOwnBySlotIdx).isObject() &&
-          "Object argument of PutOwnBySlotIdx must be an object");
-      ENCODE_HV_AS_SHV(shv, O2REG(PutOwnBySlotIdx));
-      JSObject::setNamedSlotValueUnsafe(
-          vmcast<JSObject>(O1REG(PutOwnBySlotIdx)), runtime, idVal, shv);
-      gcScope.flushToSmallCount(KEEP_HANDLES);
-      ip = nextIP;
-      DISPATCH;
-    }
 
       CASE(GetOwnBySlotIdxLong) {
-        nextIP = NEXTINST(GetOwnBySlotIdxLong);
-        idVal = ip->iGetOwnBySlotIdxLong.op3;
-        goto getOwnBySlotIdx;
+        O1REG(GetOwnBySlotIdxLong) =
+            JSObject::getNamedSlotValueUnsafe(
+                vmcast<JSObject>(O2REG(GetOwnBySlotIdxLong)),
+                runtime,
+                ip->iGetOwnBySlotIdxLong.op3)
+                .unboxToHV(runtime);
+        ip = NEXTINST(GetOwnBySlotIdxLong);
+        DISPATCH;
       }
       CASE(GetOwnBySlotIdx) {
-        nextIP = NEXTINST(GetOwnBySlotIdx);
-        idVal = ip->iGetOwnBySlotIdx.op3;
-      }
-    getOwnBySlotIdx: {
-      O1REG(GetOwnBySlotIdx) =
-          JSObject::getNamedSlotValueUnsafe(
-              vmcast<JSObject>(O2REG(GetOwnBySlotIdx)), runtime, idVal)
-              .unboxToHV(runtime);
-      ip = nextIP;
-      DISPATCH;
-    }
+        O1REG(GetOwnBySlotIdx) = JSObject::getNamedSlotValueUnsafe(
+                                     vmcast<JSObject>(O2REG(GetOwnBySlotIdx)),
+                                     runtime,
+                                     ip->iGetOwnBySlotIdx.op3)
+                                     .unboxToHV(runtime);
+        ip = NEXTINST(GetOwnBySlotIdx);
+        DISPATCH;
+      }
 
       CASE_OUTOFLINE(DelByVal);