comparison src/share/vm/opto/cfgnode.cpp @ 1543:1a1603f975b5

Merge
author kvn
date Wed, 19 May 2010 10:22:39 -0700
parents eb79484f795f ae4032fb0a5b
children c18cbe5936b8
comparison
equal deleted inserted replaced
1542:eb79484f795f 1543:1a1603f975b5
954 jt = ft; 954 jt = ft;
955 } 955 }
956 } 956 }
957 if( jtkp && ttkp ) { 957 if( jtkp && ttkp ) {
958 if( jtkp->is_loaded() && jtkp->klass()->is_interface() && 958 if( jtkp->is_loaded() && jtkp->klass()->is_interface() &&
959 !jtkp->klass_is_exact() && // Keep exact interface klass (6894807)
959 ttkp->is_loaded() && !ttkp->klass()->is_interface() ) { 960 ttkp->is_loaded() && !ttkp->klass()->is_interface() ) {
960 assert(ft == ttkp->cast_to_ptr_type(jtkp->ptr()) || 961 assert(ft == ttkp->cast_to_ptr_type(jtkp->ptr()) ||
961 ft->isa_narrowoop() && ft->make_ptr() == ttkp->cast_to_ptr_type(jtkp->ptr()), ""); 962 ft->isa_narrowoop() && ft->make_ptr() == ttkp->cast_to_ptr_type(jtkp->ptr()), "");
962 jt = ft; 963 jt = ft;
963 } 964 }