/hg/release/icedtea7-forest-2.3/hotspot: Fix merge differences
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Sep 29 14:55:32 PDT 2013
changeset 4b04ad70d347 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=4b04ad70d347
author: andrew
date: Fri Sep 27 20:43:52 2013 +0100
Fix merge differences
diffstat:
src/share/vm/classfile/systemDictionary.cpp | 1 +
src/share/vm/opto/cfgnode.cpp | 2 --
src/share/vm/opto/type.cpp | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diffs (35 lines):
diff -r 38f1b987027f -r 4b04ad70d347 src/share/vm/classfile/systemDictionary.cpp
--- 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,
diff -r 38f1b987027f -r 4b04ad70d347 src/share/vm/opto/cfgnode.cpp
--- 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
diff -r 38f1b987027f -r 4b04ad70d347 src/share/vm/opto/type.cpp
--- 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
}
More information about the distro-pkg-dev
mailing list