[riscv] Fix Check failed in bind_to

luyahan · V8 LUCI CQ · commit fdb5de2c7416 · 2025-05-25T19:31:27.000-07:00
The trampoline should be emitted before the constant pool. Bug: 420232092 Change-Id: I3a909b122607e37aca9d8765f28810ec74d5dc0b Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6578135 Auto-Submit: Yahan Lu (LuYahan) <yahan@iscas.ac.cn> Reviewed-by: Ji Qiu <qiuji@iscas.ac.cn> Commit-Queue: Ji Qiu <qiuji@iscas.ac.cn> Cr-Commit-Position: refs/heads/main@{#100480}
diff --git a/src/codegen/riscv/assembler-riscv.cc b/src/codegen/riscv/assembler-riscv.cc
@@ -720,8 +720,8 @@ void Assembler::bind_to(Label* L, int pos) {
             trampoline_pos = get_trampoline_entry(fixup_pos);
             CHECK_NE(trampoline_pos, kInvalidSlotPos);
           }
-          CHECK((trampoline_pos - fixup_pos) <= kMaxBranchOffset);
           DEBUG_PRINTF("\t\ttrampolining: %d\n", trampoline_pos);
+          CHECK((trampoline_pos - fixup_pos) <= kMaxBranchOffset);
           target_at_put(fixup_pos, trampoline_pos, false);
           fixup_pos = trampoline_pos;
         }
diff --git a/src/codegen/riscv/assembler-riscv.h b/src/codegen/riscv/assembler-riscv.h
@@ -731,16 +731,19 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase,
 
   // Block the emission of the trampoline pool before pc_offset.
   void BlockTrampolinePoolBefore(int pc_offset) {
-    if (no_trampoline_pool_before_ < pc_offset)
+    if (no_trampoline_pool_before_ < pc_offset) {
+      DEBUG_PRINTF("\tBlockTrampolinePoolBefore %d\n", pc_offset);
       no_trampoline_pool_before_ = pc_offset;
+    }
   }
 
   void StartBlockTrampolinePool() {
-    DEBUG_PRINTF("\tStartBlockTrampolinePool\n");
+    DEBUG_PRINTF("\tStartBlockTrampolinePool %d\n", pc_offset());
     trampoline_pool_blocked_nesting_++;
   }
 
   void EndBlockTrampolinePool() {
+    DEBUG_PRINTF("\tEndBlockTrampolinePool\n");
     trampoline_pool_blocked_nesting_--;
     DEBUG_PRINTF("\ttrampoline_pool_blocked_nesting:%d\n",
                  trampoline_pool_blocked_nesting_);
diff --git a/src/codegen/riscv/macro-assembler-riscv.cc b/src/codegen/riscv/macro-assembler-riscv.cc
@@ -4940,7 +4940,6 @@ void MacroAssembler::Jump(Register target, Condition cond, Register rs,
   BlockTrampolinePoolScope block_trampoline_pool(this);
   if (cond == cc_always) {
     jr(target);
-    ForceConstantPoolEmissionWithoutJump();
   } else {
     BRANCH_ARGS_CHECK(cond, rs, rt);
     Branch(kInstrSize * 2, NegateCondition(cond), rs, rt);
@@ -5353,9 +5352,6 @@ void MacroAssembler::StoreReturnAddressAndCall(Register target) {
 
 void MacroAssembler::Ret(Condition cond, Register rs, const Operand& rt) {
   Jump(ra, cond, rs, rt);
-  if (cond == al) {
-    ForceConstantPoolEmissionWithoutJump();
-  }
 }
 
 void MacroAssembler::BranchLong(Label* L) {

Original file line number	Diff line number	Diff line change
`@@ -720,8 +720,8 @@ void Assembler::bind_to(Label* L, int pos) {`
`720`	`720`	`trampoline_pos = get_trampoline_entry(fixup_pos);`
`721`	`721`	`CHECK_NE(trampoline_pos, kInvalidSlotPos);`
`722`	`722`	`}`
`723`		`- CHECK((trampoline_pos - fixup_pos) <= kMaxBranchOffset);`
`724`	`723`	`DEBUG_PRINTF("\t\ttrampolining: %d\n", trampoline_pos);`
	`724`	`+ CHECK((trampoline_pos - fixup_pos) <= kMaxBranchOffset);`
`725`	`725`	`target_at_put(fixup_pos, trampoline_pos, false);`
`726`	`726`	`fixup_pos = trampoline_pos;`
`727`	`727`	`}`