jdk8-mips64-public/hotspot: comparison src/share/vm/opto/compile.cpp

-:2251ba078bec
+:eb7ce841ccec
 _macro_nodes = new(comp_arena()) GrowableArray<Node*>(comp_arena(), 8,  0, NULL);
 _predicate_opaqs = new(comp_arena()) GrowableArray<Node*>(comp_arena(), 8,  0, NULL);
 _expensive_nodes = new(comp_arena()) GrowableArray<Node*>(comp_arena(), 8,  0, NULL);
 _range_check_casts = new(comp_arena()) GrowableArray<Node*>(comp_arena(), 8,  0, NULL);
 register_library_intrinsics();
+#ifdef ASSERT
+_type_verify_symmetry = true;
+#endif
 }
 //---------------------------init_start----------------------------------------
 // Install the StartNode on this compile object.
 void Compile::init_start(StartNode* s) {
 set_inlining_incrementally(false);
 }
+// Remove edges from "root" to each SafePoint at a backward branch.
+// They were inserted during parsing (see add_safepoint()) to make
+// infinite loops without calls or exceptions visible to root, i.e.,
+// useful.
+void Compile::remove_root_to_sfpts_edges() {
+Node *r = root();
+if (r != NULL) {
+for (uint i = r->req(); i < r->len(); ++i) {
+Node *n = r->in(i);
+if (n != NULL && n->is_SafePoint()) {
+r->rm_prec(i);
+--i;
+}
+}
+}
+}
 //------------------------------Optimize---------------------------------------
 // Given a graph, optimize it.
 void Compile::Optimize() {
 TracePhase t1("optimizer", &_t_optimizer, true);
 print_method(PHASE_INCREMENTAL_BOXING_INLINE, 2);
 if (failing())  return;
 }
+// Now that all inlining is over, cut edge from root to loop
+// safepoints
+remove_root_to_sfpts_edges();
 // Remove the speculative part of types and clean up the graph from
 // the extra CastPP nodes whose only purpose is to carry them. Do
 // that early so that optimizations are not disrupted by the extra
 // CastPP nodes.
 if (use->is_Proj() && p != use && use->as_Proj()->_con == p->_con) {
 proj = use;
 break;
 }
 }
-assert(proj != NULL, "must be found");
+assert(proj != NULL || p->_con == TypeFunc::I_O, "io may be dropped at an infinite loop");
-p->subsume_by(proj, this);
+if (proj != NULL) {
+p->subsume_by(proj, this);
+}
 }
 }
 break;
 }

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/opto/compile.cpp

src/share/vm/opto/compile.cpp