comparison src/share/vm/opto/compile.cpp @ 24094:9b69cec6d01b

Merge with jdk8u121-b13
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Mon, 06 Feb 2017 17:18:57 +0100
parents f13e777eb255 371fd9bb8202
children
comparison
equal deleted inserted replaced
23997:9a740aa0d87b 24094:9b69cec6d01b
606 masm.bind(fakeL); 606 masm.bind(fakeL);
607 n->as_MachBranch()->save_label(&saveL, &save_bnum); 607 n->as_MachBranch()->save_label(&saveL, &save_bnum);
608 n->as_MachBranch()->label_set(&fakeL, 0); 608 n->as_MachBranch()->label_set(&fakeL, 0);
609 } 609 }
610 n->emit(buf, this->regalloc()); 610 n->emit(buf, this->regalloc());
611
612 // Emitting into the scratch buffer should not fail
613 assert (!failing(), err_msg_res("Must not have pending failure. Reason is: %s", failure_reason()));
614
611 if (is_branch) // Restore label. 615 if (is_branch) // Restore label.
612 n->as_MachBranch()->label_set(saveL, save_bnum); 616 n->as_MachBranch()->label_set(saveL, save_bnum);
613 617
614 // End scratch_emit_size section. 618 // End scratch_emit_size section.
615 set_in_scratch_emit_size(false); 619 set_in_scratch_emit_size(false);