RFR: [8] Fix AArch64 build failure: misplaced #endif

Aleksey Shipilev shade at redhat.com
Tue May 15 11:57:03 UTC 2018


diff -r 773ac3fb48ab src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
--- a/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp	Tue May 08 19:50:33 2018 +0200
+++ b/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp	Tue May 15 13:56:19 2018 +0200
@@ -969,7 +969,6 @@
   stack2reg(src, temp, src->type());
   reg2stack(temp, dest, dest->type(), false);
 }
-#endif

 void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code,
CodeEmitInfo* info, bool wide, bool /* unaligned */) {
   LIR_Address* addr = src->as_address_ptr();
@@ -1180,7 +1179,7 @@
   __ block_comment("} Shenandoah write barrier");

 }
-
+#endif

 void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) {
   LIR_Opr src  = op->in_opr();


Testing: x86 minimal1 build, aarch64 build

Thanks,
-Aleksey



More information about the shenandoah-dev mailing list