Fix error about emit constant pool

- Can't emit constant pool in deconstruct func. - Forced emit when jump a target.
riscv-collab · Sep 17, 2020 · f91ac74 · f91ac74
1 parent cc79d24
commit f91ac74
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/codegen/riscv64/assembler-riscv64.h b/src/codegen/riscv64/assembler-riscv64.h
@@ -154,7 +154,6 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
                      std::unique_ptr<AssemblerBuffer> = {});
 
   virtual ~Assembler() {
-    ForceConstantPoolEmissionWithoutJump();
     CHECK(constpool_.IsEmpty()); 
   }
 

diff --git a/src/codegen/riscv64/macro-assembler-riscv64.cc b/src/codegen/riscv64/macro-assembler-riscv64.cc
@@ -2877,7 +2877,7 @@ void TurboAssembler::Jump(Register target, Condition cond, Register rs,
   BlockTrampolinePoolScope block_trampoline_pool(this);
   if (cond == cc_always) {
     jr(target);
-    EmitConstPoolWithJumpIfNeeded();
+    ForceConstantPoolEmissionWithoutJump();
   } else {
     BRANCH_ARGS_CHECK(cond, rs, rt);
     Branch(kInstrSize * 2, NegateCondition(cond), rs, rt);