< prev index next >
src/hotspot/share/opto/compile.cpp
Print this page
@@ -74,13 +74,10 @@
#include "runtime/stubRoutines.hpp"
#include "runtime/timer.hpp"
#include "utilities/align.hpp"
#include "utilities/copy.hpp"
#include "utilities/macros.hpp"
-#if INCLUDE_ZGC
-#include "gc/z/c2/zBarrierSetC2.hpp"
-#endif
// -------------------- Compile::mach_constant_base_node -----------------------
// Constant table base node singleton.
MachConstantBaseNode* Compile::mach_constant_base_node() {
@@ -988,10 +985,11 @@
_trace_opto_output(directive->TraceOptoOutputOption),
#endif
_has_method_handle_invokes(false),
_clinit_barrier_on_entry(false),
_comp_arena(mtCompiler),
+ _barrier_set_state(BarrierSet::barrier_set()->barrier_set_c2()->create_barrier_state(comp_arena())),
_env(ci_env),
_directive(directive),
_log(ci_env->log()),
_failure_reason(NULL),
_congraph(NULL),
@@ -2410,17 +2408,10 @@
return;
}
print_method(PHASE_MACRO_EXPANSION, 2);
}
-#ifdef ASSERT
- bs->verify_gc_barriers(this, BarrierSetC2::BeforeLateInsertion);
-#endif
-
- bs->barrier_insertion_phase(C, igvn);
- if (failing()) return;
-
{
TracePhase tp("barrierExpand", &timers[_t_barrierExpand]);
if (bs->expand_barriers(this, igvn)) {
assert(failing(), "must bail out w/ explicit message");
return;
< prev index next >