*** old/src/share/vm/opto/cfgnode.cpp	Fri Jan  9 14:18:22 2009
--- new/src/share/vm/opto/cfgnode.cpp	Fri Jan  9 14:18:21 2009

*** 856,871 ****
--- 856,877 ----
    // Until we have harmony between classes and interfaces in the type
    // lattice, we must tread carefully around phis which implicitly
    // convert the one to the other.
    const TypePtr* ttp = _type->make_ptr();
    const TypeInstPtr* ttip = (ttp != NULL) ? ttp->isa_instptr() : NULL;
+   const TypeKlassPtr* ttkp = (ttp != NULL) ? ttp->isa_klassptr() : NULL;
    bool is_intf = false;
    if (ttip != NULL) {
      ciKlass* k = ttip->klass();
      if (k->is_loaded() && k->is_interface())
        is_intf = true;
    }
+   if (ttkp != NULL) {
+     ciKlass* k = ttkp->klass();
+     if (k->is_loaded() && k->is_interface())
+       is_intf = true;
+   }
  
    // Default case: merge all inputs
    const Type *t = Type::TOP;        // Merged type starting value
    for (uint i = 1; i < req(); ++i) {// For all paths in
      // Reachable control path?

*** 919,928 ****
--- 925,936 ----
      // be 'I' or 'j/l/O'.  Thus we'll pick 'j/l/O'.  If this then flows
      // into a Phi which "knows" it's an Interface type we'll have to
      // uplift the type.
      if( !t->empty() && ttip && ttip->is_loaded() && ttip->klass()->is_interface() )
        { assert(ft == _type, ""); } // Uplift to interface
+     else if( !t->empty() && ttkp && ttkp->is_loaded() && ttkp->klass()->is_interface() )
+       { assert(ft == _type, ""); } // Uplift to interface
      // Otherwise it's something stupid like non-overlapping int ranges
      // found on dying counted loops.
      else
        { assert(ft == Type::TOP, ""); } // Canonical empty value
    }

*** 934,951 ****
--- 942,968 ----
      // class-typed Phi and an interface flows in, it's possible that the meet &
      // join report an interface back out.  This isn't possible but happens
      // because the type system doesn't interact well with interfaces.
      const TypePtr *jtp = jt->make_ptr();
      const TypeInstPtr *jtip = (jtp != NULL) ? jtp->isa_instptr() : NULL;
+     const TypeKlassPtr *jtkp = (jtp != NULL) ? jtp->isa_klassptr() : NULL;
      if( jtip && ttip ) {
        if( jtip->is_loaded() &&  jtip->klass()->is_interface() &&
            ttip->is_loaded() && !ttip->klass()->is_interface() ) {
          // Happens in a CTW of rt.jar, 320-341, no extra flags
          assert(ft == ttip->cast_to_ptr_type(jtip->ptr()) ||
                 ft->isa_narrowoop() && ft->make_ptr() == ttip->cast_to_ptr_type(jtip->ptr()), "");
          jt = ft;
        }
+     }
+     if( jtkp && ttkp ) {
+       if( jtkp->is_loaded() &&  jtkp->klass()->is_interface() &&
+           ttkp->is_loaded() && !ttkp->klass()->is_interface() ) {
+         assert(ft == ttkp->cast_to_ptr_type(jtkp->ptr()) ||
+                ft->isa_narrowoop() && ft->make_ptr() == ttkp->cast_to_ptr_type(jtkp->ptr()), "");
+         jt = ft;
+       }
      }
      if (jt != ft && jt->base() == ft->base()) {
        if (jt->isa_int() &&
            jt->is_int()->_lo == ft->is_int()->_lo &&
            jt->is_int()->_hi == ft->is_int()->_hi)