src/cpu/aarch64/vm/assembler_aarch64.cpp

@@ -61,11 +61,10 @@
 // #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
 // #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 // #include "gc_implementation/g1/heapRegion.hpp"
 // #endif
 
-
 extern "C" void entry(CodeBuffer *cb);
 
 #define __ _masm.
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */

@@ -1360,54 +1359,49 @@
 
 void Assembler::br(Condition cc, Label &L) {
   if (L.is_bound()) {
     br(cc, target(L));
   } else {
-    InstructionMark im(this);
     L.add_patch_at(code(), locator());
     br(cc, pc());
   }
 }
 
 void Assembler::wrap_label(Label &L,
                                  Assembler::uncond_branch_insn insn) {
   if (L.is_bound()) {
     (this->*insn)(target(L));
   } else {
-    InstructionMark im(this);
     L.add_patch_at(code(), locator());
     (this->*insn)(pc());
   }
 }
 
 void Assembler::wrap_label(Register r, Label &L,
                                  compare_and_branch_insn insn) {
   if (L.is_bound()) {
     (this->*insn)(r, target(L));
   } else {
-    InstructionMark im(this);
     L.add_patch_at(code(), locator());
     (this->*insn)(r, pc());
   }
 }
 
 void Assembler::wrap_label(Register r, int bitpos, Label &L,
                                  test_and_branch_insn insn) {
   if (L.is_bound()) {
     (this->*insn)(r, bitpos, target(L));
   } else {
-    InstructionMark im(this);
     L.add_patch_at(code(), locator());
     (this->*insn)(r, bitpos, pc());
   }
 }
 
 void Assembler::wrap_label(Label &L, prfop op, prefetch_insn insn) {
   if (L.is_bound()) {
     (this->*insn)(target(L), op);
   } else {
-    InstructionMark im(this);
     L.add_patch_at(code(), locator());
     (this->*insn)(pc(), op);
   }
 }