# HG changeset patch
# User andrew
# Date 1380311032 -3600
# Node ID 4b04ad70d347de163759ea0670bf9a467d77eacb
# Parent  38f1b987027f9fd3eadab1bdfd00a8cf5b82def1
Fix merge differences

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
   }