--- a/hotspot/src/share/vm/opto/compile.cpp Mon Apr 15 16:20:05 2013 -0700
+++ b/hotspot/src/share/vm/opto/compile.cpp Tue Apr 16 10:08:41 2013 +0200
@@ -2127,22 +2127,19 @@
}
NOT_PRODUCT( verify_graph_edges(); )
- PhaseChaitin regalloc(unique(),cfg,m);
+ PhaseChaitin regalloc(unique(), cfg, m);
_regalloc = ®alloc;
{
TracePhase t2("regalloc", &_t_registerAllocation, true);
- // Perform any platform dependent preallocation actions. This is used,
- // for example, to avoid taking an implicit null pointer exception
- // using the frame pointer on win95.
- _regalloc->pd_preallocate_hook();
-
// Perform register allocation. After Chaitin, use-def chains are
// no longer accurate (at spill code) and so must be ignored.
// Node->LRG->reg mappings are still accurate.
_regalloc->Register_Allocate();
// Bail out if the allocator builds too many nodes
- if (failing()) return;
+ if (failing()) {
+ return;
+ }
}
// Prior to register allocation we kept empty basic blocks in case the
@@ -2160,9 +2157,6 @@
cfg.fixup_flow();
}
- // Perform any platform dependent postallocation verifications.
- debug_only( _regalloc->pd_postallocate_verify_hook(); )
-
// Apply peephole optimizations
if( OptoPeephole ) {
NOT_PRODUCT( TracePhase t2("peephole", &_t_peephole, TimeCompiler); )