Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jul 13, 2020
2 parents 082d375 + a14490d commit 85b1a69fc7e4281b6194f52403d06a067fdb7aec
Showing with 9 additions and 0 deletions.
  1. +9 −0 src/hotspot/share/opto/stringopts.cpp
@@ -540,6 +540,15 @@ StringConcat* PhaseStringOpts::build_candidate(CallStaticJavaNode* call) {
cnode->method()->signature()->as_symbol() == int_sig)) {
sc->add_control(cnode);
Node* arg = cnode->in(TypeFunc::Parms + 1);
if (arg == NULL || arg->is_top()) {
#ifndef PRODUCT
if (PrintOptimizeStringConcat) {
tty->print("giving up because the call is effectively dead");
cnode->jvms()->dump_spec(tty); tty->cr();
}
#endif
break;
}
if (cnode->method()->signature()->as_symbol() == int_sig) {
sc->push_int(arg);
} else if (cnode->method()->signature()->as_symbol() == char_sig) {

0 comments on commit 85b1a69

Please sign in to comment.
You can’t perform that action at this time.