Print this page
rev 1081 : 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 ↓ 300 lines elided ↑ open up ↑
 301  301    // v-calls.  Let interface calls happen.
 302  302    ciInstanceKlass* holder_klass  = dest_method->holder();
 303  303    if (!holder_klass->is_initialized() &&
 304  304        !holder_klass->is_interface()) {
 305  305      uncommon_trap(Deoptimization::Reason_uninitialized,
 306  306                    Deoptimization::Action_reinterpret,
 307  307                    holder_klass);
 308  308      return true;
 309  309    }
 310  310    if (dest_method->is_method_handle_invoke()
 311      -      && holder_klass->name() == ciSymbol::java_dyn_Dynamic()) {
      311 +      && holder_klass->name() == ciSymbol::java_dyn_InvokeDynamic()) {
 312  312      // FIXME: NYI
 313  313      uncommon_trap(Deoptimization::Reason_unhandled,
 314  314                    Deoptimization::Action_none,
 315  315                    holder_klass);
 316  316      return true;
 317  317    }
 318  318  
 319  319    assert(dest_method->will_link(method()->holder(), klass, bc()), "dest_method: typeflow responsibility");
 320  320    return false;
 321  321  }
↓ open down ↓ 612 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX