--- a/hotspot/src/share/vm/opto/stringopts.cpp Tue Nov 27 12:48:52 2012 -0800
+++ b/hotspot/src/share/vm/opto/stringopts.cpp Tue Nov 27 17:24:15 2012 -0800
@@ -241,13 +241,13 @@
_stringopts->gvn()->transform(call);
C->gvn_replace_by(uct, call);
- uct->disconnect_inputs(NULL);
+ uct->disconnect_inputs(NULL, C);
}
}
void cleanup() {
// disconnect the hook node
- _arguments->disconnect_inputs(NULL);
+ _arguments->disconnect_inputs(NULL, _stringopts->C);
}
};
@@ -358,7 +358,7 @@
C->gvn_replace_by(mem_proj, mem);
}
C->gvn_replace_by(init, C->top());
- init->disconnect_inputs(NULL);
+ init->disconnect_inputs(NULL, C);
}
Node_List PhaseStringOpts::collect_toString_calls() {
@@ -1477,6 +1477,6 @@
kit.replace_call(sc->end(), result);
// Unhook any hook nodes
- string_sizes->disconnect_inputs(NULL);
+ string_sizes->disconnect_inputs(NULL, C);
sc->cleanup();
}