Mercurial > hg > truffle
diff src/share/vm/opto/subnode.cpp @ 6725:da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
| author | coleenp |
|---|---|
| date | Sat, 01 Sep 2012 13:25:18 -0400 |
| parents | ae9241bbce4a |
| children | e626685e9f6c |
line wrap: on
line diff
--- a/src/share/vm/opto/subnode.cpp Fri Aug 31 16:39:35 2012 -0700 +++ b/src/share/vm/opto/subnode.cpp Sat Sep 01 13:25:18 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -664,9 +664,7 @@ // See if neither subclasses the other, or if the class on top // is precise. In either of these cases, the compare is known // to fail if at least one of the pointers is provably not null. - if (klass0->equals(klass1) || // if types are unequal but klasses are - !klass0->is_java_klass() || // types not part of Java language? - !klass1->is_java_klass()) { // types not part of Java language? + if (klass0->equals(klass1)) { // if types are unequal but klasses are equal // Do nothing; we know nothing for imprecise types } else if (klass0->is_subtype_of(klass1)) { // If klass1's type is PRECISE, then classes are unrelated. @@ -744,7 +742,7 @@ } // return the ConP(Foo.klass) - assert(mirror_type->is_klass(), "mirror_type should represent a klassOop"); + assert(mirror_type->is_klass(), "mirror_type should represent a Klass*"); return phase->makecon(TypeKlassPtr::make(mirror_type->as_klass())); } @@ -891,9 +889,7 @@ // See if neither subclasses the other, or if the class on top // is precise. In either of these cases, the compare is known // to fail if at least one of the pointers is provably not null. - if (klass0->equals(klass1) || // if types are unequal but klasses are - !klass0->is_java_klass() || // types not part of Java language? - !klass1->is_java_klass()) { // types not part of Java language? + if (klass0->equals(klass1)) { // if types are unequal but klasses are equal // Do nothing; we know nothing for imprecise types } else if (klass0->is_subtype_of(klass1)) { // If klass1's type is PRECISE, then classes are unrelated.