[loong64][sandbox] Port some sandbox patches to loong64 part2

zjiaz · V8 LUCI CQ · commit 218de0f34007 · 2024-02-19T11:50:18.000Z
Port commit 2311eb0 - Make DeoptimizationData a trusted object Port commit 0981273 - Turn Code::deopt_data_or_interpreter_data into a trusted pointer Port commit 606956c - Use protected ptr for Code::deopt_data_or_interpreter_data Port commit f75673f - Use protected pointers in InterpreterData Port commit 0b51817 - Fix handling of InterpreterData in InterpreterEnterAtBytecode Change-Id: Ie19ba0b52d215b4e2da8191f5aaf4e02f027cacb Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5307435 Commit-Queue: Igor Sheludko <ishell@chromium.org> Auto-Submit: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn> Commit-Queue: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn> Reviewed-by: Igor Sheludko <ishell@chromium.org> Cr-Commit-Position: refs/heads/main@{#92400}
diff --git a/src/builtins/loong64/builtins-loong64.cc b/src/builtins/loong64/builtins-loong64.cc
@@ -346,9 +346,8 @@ static void GetSharedFunctionInfoBytecodeOrBaseline(MacroAssembler* masm,
 #endif  // !V8_JITLESS
 
   __ Branch(&done, ne, scratch1, Operand(INTERPRETER_DATA_TYPE));
-  __ LoadTrustedPointerField(
-      bytecode, FieldMemOperand(data, InterpreterData::kBytecodeArrayOffset),
-      kBytecodeArrayIndirectPointerTag);
+  __ LoadProtectedPointerField(
+      bytecode, FieldMemOperand(data, InterpreterData::kBytecodeArrayOffset));
 
   __ bind(&done);
 }
@@ -1712,7 +1711,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
   __ JumpIfObjectType(&builtin_trampoline, ne, t0, INTERPRETER_DATA_TYPE,
                       kInterpreterDispatchTableRegister);
 
-  __ LoadTaggedField(
+  __ LoadProtectedPointerField(
       t0, FieldMemOperand(t0, InterpreterData::kInterpreterTrampolineOffset));
   __ LoadCodeInstructionStart(t0, t0);
   __ Branch(&trampoline_loaded);
@@ -1971,15 +1970,15 @@ void OnStackReplacement(MacroAssembler* masm, OsrSourceTier source,
 
   // Load deoptimization data from the code object.
   // <deopt_data> = <code>[#deoptimization_data_offset]
-  __ LoadTaggedField(
+  __ LoadProtectedPointerField(
       a1, MemOperand(maybe_target_code,
                      Code::kDeoptimizationDataOrInterpreterDataOffset -
                          kHeapObjectTag));
 
   // Load the OSR entrypoint offset from the deoptimization data.
   // <osr_offset> = <deopt_data>[#header_size + #osr_pc_offset]
   __ SmiUntagField(a1,
-                   MemOperand(a1, FixedArray::OffsetOfElementAt(
+                   MemOperand(a1, TrustedFixedArray::OffsetOfElementAt(
                                       DeoptimizationData::kOsrPcOffsetIndex) -
                                       kHeapObjectTag));
 
