equal
deleted
inserted
replaced
74 #include "runtime/stubRoutines.hpp" |
74 #include "runtime/stubRoutines.hpp" |
75 #include "runtime/timer.hpp" |
75 #include "runtime/timer.hpp" |
76 #include "utilities/align.hpp" |
76 #include "utilities/align.hpp" |
77 #include "utilities/copy.hpp" |
77 #include "utilities/copy.hpp" |
78 #include "utilities/macros.hpp" |
78 #include "utilities/macros.hpp" |
79 #if INCLUDE_ZGC |
|
80 #include "gc/z/c2/zBarrierSetC2.hpp" |
|
81 #endif |
|
82 |
79 |
83 |
80 |
84 // -------------------- Compile::mach_constant_base_node ----------------------- |
81 // -------------------- Compile::mach_constant_base_node ----------------------- |
85 // Constant table base node singleton. |
82 // Constant table base node singleton. |
86 MachConstantBaseNode* Compile::mach_constant_base_node() { |
83 MachConstantBaseNode* Compile::mach_constant_base_node() { |
988 _trace_opto_output(directive->TraceOptoOutputOption), |
985 _trace_opto_output(directive->TraceOptoOutputOption), |
989 #endif |
986 #endif |
990 _has_method_handle_invokes(false), |
987 _has_method_handle_invokes(false), |
991 _clinit_barrier_on_entry(false), |
988 _clinit_barrier_on_entry(false), |
992 _comp_arena(mtCompiler), |
989 _comp_arena(mtCompiler), |
|
990 _barrier_set_state(BarrierSet::barrier_set()->barrier_set_c2()->create_barrier_state(comp_arena())), |
993 _env(ci_env), |
991 _env(ci_env), |
994 _directive(directive), |
992 _directive(directive), |
995 _log(ci_env->log()), |
993 _log(ci_env->log()), |
996 _failure_reason(NULL), |
994 _failure_reason(NULL), |
997 _congraph(NULL), |
995 _congraph(NULL), |
2409 assert(failing(), "must bail out w/ explicit message"); |
2407 assert(failing(), "must bail out w/ explicit message"); |
2410 return; |
2408 return; |
2411 } |
2409 } |
2412 print_method(PHASE_MACRO_EXPANSION, 2); |
2410 print_method(PHASE_MACRO_EXPANSION, 2); |
2413 } |
2411 } |
2414 |
|
2415 #ifdef ASSERT |
|
2416 bs->verify_gc_barriers(this, BarrierSetC2::BeforeLateInsertion); |
|
2417 #endif |
|
2418 |
|
2419 bs->barrier_insertion_phase(C, igvn); |
|
2420 if (failing()) return; |
|
2421 |
2412 |
2422 { |
2413 { |
2423 TracePhase tp("barrierExpand", &timers[_t_barrierExpand]); |
2414 TracePhase tp("barrierExpand", &timers[_t_barrierExpand]); |
2424 if (bs->expand_barriers(this, igvn)) { |
2415 if (bs->expand_barriers(this, igvn)) { |
2425 assert(failing(), "must bail out w/ explicit message"); |
2416 assert(failing(), "must bail out w/ explicit message"); |