Mercurial > hg > truffle

comparison src/share/vm/ci/ciInstance.cpp @ 6725:da91efe96a93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6724:36d1d483d5d6 6725:da91efe96a93
1 /* 1 /*
2 * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
47 } 47 }
48 // Return either a primitive type or a klass. 48 // Return either a primitive type or a klass.
49 if (java_lang_Class::is_primitive(m)) { 49 if (java_lang_Class::is_primitive(m)) {
50 return ciType::make(java_lang_Class::primitive_type(m)); 50 return ciType::make(java_lang_Class::primitive_type(m));
51 } else { 51 } else {
52 klassOop k = java_lang_Class::as_klassOop(m); 52 Klass* k = java_lang_Class::as_Klass(m);
53 assert(k != NULL, ""); 53 assert(k != NULL, "");
54 return CURRENT_THREAD_ENV->get_object(k)->as_klass(); 54 return CURRENT_THREAD_ENV->get_klass(k);
55 } 55 }
56 } 56 }
57 57
58 // ------------------------------------------------------------------ 58 // ------------------------------------------------------------------
59 // ciInstance::field_value 59 // ciInstance::field_value
140 } 140 }
141 141
142 142
143 ciKlass* ciInstance::java_lang_Class_klass() { 143 ciKlass* ciInstance::java_lang_Class_klass() {
144 VM_ENTRY_MARK; 144 VM_ENTRY_MARK;
145 return CURRENT_ENV->get_object(java_lang_Class::as_klassOop(get_oop()))->as_klass(); 145 return CURRENT_ENV->get_metadata(java_lang_Class::as_Klass(get_oop()))->as_klass();
146 } 146 }