Mercurial > hg > truffle
diff src/share/vm/ci/ciInstance.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 | 3fa3c7e4d4f3 |
children | 59982ff9e0ec |
line wrap: on
line diff
--- a/src/share/vm/ci/ciInstance.cpp Fri Aug 31 16:39:35 2012 -0700 +++ b/src/share/vm/ci/ciInstance.cpp Sat Sep 01 13:25:18 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -49,9 +49,9 @@ if (java_lang_Class::is_primitive(m)) { return ciType::make(java_lang_Class::primitive_type(m)); } else { - klassOop k = java_lang_Class::as_klassOop(m); + Klass* k = java_lang_Class::as_Klass(m); assert(k != NULL, ""); - return CURRENT_THREAD_ENV->get_object(k)->as_klass(); + return CURRENT_THREAD_ENV->get_klass(k); } } @@ -142,5 +142,5 @@ ciKlass* ciInstance::java_lang_Class_klass() { VM_ENTRY_MARK; - return CURRENT_ENV->get_object(java_lang_Class::as_klassOop(get_oop()))->as_klass(); + return CURRENT_ENV->get_metadata(java_lang_Class::as_Klass(get_oop()))->as_klass(); }