Print this page
rev 1024 : imported patch indy-cleanup-6893081.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/opto/doCall.cpp
          +++ new/src/share/vm/opto/doCall.cpp
↓ open down ↓ 241 lines elided ↑ open up ↑
 242  242    // v-calls.  Let interface calls happen.
 243  243    ciInstanceKlass* holder_klass  = dest_method->holder();
 244  244    if (!holder_klass->is_initialized() &&
 245  245        !holder_klass->is_interface()) {
 246  246      uncommon_trap(Deoptimization::Reason_uninitialized,
 247  247                    Deoptimization::Action_reinterpret,
 248  248                    holder_klass);
 249  249      return true;
 250  250    }
 251  251    if (dest_method->is_method_handle_invoke()
 252      -      && holder_klass->name() == ciSymbol::java_dyn_Dynamic()) {
      252 +      && holder_klass->name() == ciSymbol::java_dyn_InvokeDynamic()) {
 253  253      // FIXME: NYI
 254  254      uncommon_trap(Deoptimization::Reason_unhandled,
 255  255                    Deoptimization::Action_none,
 256  256                    holder_klass);
 257  257      return true;
 258  258    }
 259  259  
 260  260    assert(dest_method->will_link(method()->holder(), klass, bc()), "dest_method: typeflow responsibility");
 261  261    return false;
 262  262  }
↓ open down ↓ 612 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX