Mercurial > hg > openjdk > icedtea > jdk7 > hotspot

changeset 3608:aa7b116597d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove differences resulting from merges.
author andrew
date Fri, 24 Aug 2012 13:24:37 +0100
parents a14247f5e52e
children 2aad7a18d716
files src/share/vm/gc_implementation/g1/concurrentMark.cpp src/share/vm/opto/cfgnode.cpp src/share/vm/opto/type.cpp
diffstat 3 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Aug 24 13:06:28 2012 +0100
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Aug 24 13:24:37 2012 +0100
@@ -5407,7 +5407,7 @@
                  G1PPRL_SUM_BYTE_FORMAT("region-size"),
                  g1_committed.start(), g1_committed.end(),
                  g1_reserved.start(), g1_reserved.end(),
-                 (size_t)HeapRegion::GrainBytes);
+                 HeapRegion::GrainBytes);
   _out->print_cr(G1PPRL_LINE_PREFIX);
   _out->print_cr(G1PPRL_LINE_PREFIX
                  G1PPRL_TYPE_H_FORMAT
--- a/src/share/vm/opto/cfgnode.cpp	Fri Aug 24 13:06:28 2012 +0100
+++ b/src/share/vm/opto/cfgnode.cpp	Fri Aug 24 13:24:37 2012 +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 24 13:06:28 2012 +0100
+++ b/src/share/vm/opto/type.cpp	Fri Aug 24 13:24:37 2012 +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
   }