Mercurial > hg > release > icedtea7-forest-2.3 > hotspot
changeset 3830:4b04ad70d347
Fix merge differences
author | andrew |
---|---|
date | Fri, 27 Sep 2013 20:43:52 +0100 |
parents | 38f1b987027f |
children | 05cfb8042c3c |
files | src/share/vm/classfile/systemDictionary.cpp src/share/vm/opto/cfgnode.cpp src/share/vm/opto/type.cpp |
diffstat | 3 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Fri Aug 09 12:21:36 2013 +0100 +++ b/src/share/vm/classfile/systemDictionary.cpp Fri Sep 27 20:43:52 2013 +0100 @@ -2252,6 +2252,7 @@ // Better never do a GC while we're holding these oops No_Safepoint_Verifier nosafepoint; + klassOop klass1 = find_class(d_index1, d_hash1, constraint_name, class_loader1); klassOop klass2 = find_class(d_index2, d_hash2, constraint_name, class_loader2); return constraints()->add_entry(constraint_name, klass1, class_loader1,
--- a/src/share/vm/opto/cfgnode.cpp Fri Aug 09 12:21:36 2013 +0100 +++ b/src/share/vm/opto/cfgnode.cpp Fri Sep 27 20:43:52 2013 +0100 @@ -941,8 +941,6 @@ { assert(ft == _type, ""); } // Uplift to interface else if( !t->empty() && ttkp && ttkp->is_loaded() && ttkp->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
--- a/src/share/vm/opto/type.cpp Fri Aug 09 12:21:36 2013 +0100 +++ b/src/share/vm/opto/type.cpp Fri Sep 27 20:43:52 2013 +0100 @@ -2577,8 +2577,6 @@ return kills; // Uplift to interface if (!empty() && ktkp != NULL && ktkp->klass()->is_loaded() && ktkp->klass()->is_interface()) return kills; // Uplift to interface - if (!empty() && ktkp != NULL && ktkp->klass()->is_loaded() && ktkp->klass()->is_interface()) - return kills; // Uplift to interface return Type::TOP; // Canonical empty value }