Mercurial > hg > truffle
diff src/share/vm/ci/ciStreams.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 | 7f813940ac35 |
children | f6b0eb4e44cf |
line wrap: on
line diff
--- a/src/share/vm/ci/ciStreams.cpp Fri Aug 31 16:39:35 2012 -0700 +++ b/src/share/vm/ci/ciStreams.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 @@ -23,7 +23,6 @@ */ #include "precompiled.hpp" -#include "ci/ciCPCache.hpp" #include "ci/ciCallSite.hpp" #include "ci/ciConstant.hpp" #include "ci/ciField.hpp" @@ -186,7 +185,7 @@ // or checkcast, get the referenced klass. ciKlass* ciBytecodeStream::get_klass(bool& will_link) { VM_ENTRY_MARK; - constantPoolHandle cpool(_method->get_methodOop()->constants()); + constantPoolHandle cpool(_method->get_Method()->constants()); return CURRENT_ENV->get_klass_by_index(cpool, get_klass_index(), will_link, _holder); } @@ -211,12 +210,14 @@ // ------------------------------------------------------------------ // ciBytecodeStream::get_constant_pool_index -// Decode any CP cache index into a regular pool index. +// Decode any reference index into a regular pool index. int ciBytecodeStream::get_constant_pool_index() const { // work-alike for Bytecode_loadconstant::pool_index() int index = get_constant_raw_index(); if (has_cache_index()) { - return get_cpcache()->get_pool_index(index); + VM_ENTRY_MARK; + constantPoolHandle cpool(_method->get_Method()->constants()); + return cpool->object_to_cp_index(index); } return index; } @@ -242,7 +243,7 @@ pool_index = -1; } VM_ENTRY_MARK; - constantPoolHandle cpool(_method->get_methodOop()->constants()); + constantPoolHandle cpool(_method->get_Method()->constants()); return CURRENT_ENV->get_constant_by_index(cpool, pool_index, cache_index, _holder); } @@ -253,7 +254,7 @@ // constant. constantTag ciBytecodeStream::get_constant_pool_tag(int index) const { VM_ENTRY_MARK; - return _method->get_methodOop()->constants()->tag_at(index); + return _method->get_Method()->constants()->tag_at(index); } // ------------------------------------------------------------------ @@ -295,7 +296,7 @@ // for checking linkability when retrieving the associated field. ciInstanceKlass* ciBytecodeStream::get_declared_field_holder() { VM_ENTRY_MARK; - constantPoolHandle cpool(_method->get_methodOop()->constants()); + constantPoolHandle cpool(_method->get_Method()->constants()); int holder_index = get_field_holder_index(); bool ignore; return CURRENT_ENV->get_klass_by_index(cpool, holder_index, ignore, _holder) @@ -310,7 +311,7 @@ // deoptimization information. int ciBytecodeStream::get_field_holder_index() { GUARDED_VM_ENTRY( - constantPoolOop cpool = _holder->get_instanceKlass()->constants(); + ConstantPool* cpool = _holder->get_instanceKlass()->constants(); return cpool->klass_ref_index_at(get_field_index()); ) } @@ -323,7 +324,7 @@ // deoptimization information. int ciBytecodeStream::get_field_signature_index() { VM_ENTRY_MARK; - constantPoolOop cpool = _holder->get_instanceKlass()->constants(); + ConstantPool* cpool = _holder->get_instanceKlass()->constants(); int nt_index = cpool->name_and_type_ref_index_at(get_field_index()); return cpool->signature_ref_index_at(nt_index); } @@ -360,14 +361,14 @@ ciMethod* ciBytecodeStream::get_method(bool& will_link, ciSignature* *declared_signature_result) { VM_ENTRY_MARK; ciEnv* env = CURRENT_ENV; - constantPoolHandle cpool(_method->get_methodOop()->constants()); + constantPoolHandle cpool(_method->get_Method()->constants()); ciMethod* m = env->get_method_by_index(cpool, get_method_index(), cur_bc(), _holder); will_link = m->is_loaded(); // Get declared method signature and return it. if (has_optional_appendix()) { const int sig_index = get_method_signature_index(); Symbol* sig_sym = cpool->symbol_at(sig_index); - ciKlass* pool_holder = env->get_object(cpool->pool_holder())->as_klass(); + ciKlass* pool_holder = env->get_klass(cpool->pool_holder()); (*declared_signature_result) = new (env->arena()) ciSignature(pool_holder, cpool, env->get_symbol(sig_sym)); } else { (*declared_signature_result) = m->signature(); @@ -382,8 +383,8 @@ // constant pool cache at the current bci. bool ciBytecodeStream::has_appendix() { VM_ENTRY_MARK; - constantPoolHandle cpool(_method->get_methodOop()->constants()); - return constantPoolOopDesc::has_appendix_at_if_loaded(cpool, get_method_index()); + constantPoolHandle cpool(_method->get_Method()->constants()); + return ConstantPool::has_appendix_at_if_loaded(cpool, get_method_index()); } // ------------------------------------------------------------------ @@ -393,8 +394,8 @@ // the current bci. ciObject* ciBytecodeStream::get_appendix() { VM_ENTRY_MARK; - constantPoolHandle cpool(_method->get_methodOop()->constants()); - oop appendix_oop = constantPoolOopDesc::appendix_at_if_loaded(cpool, get_method_index()); + constantPoolHandle cpool(_method->get_Method()->constants()); + oop appendix_oop = ConstantPool::appendix_at_if_loaded(cpool, get_method_index()); return CURRENT_ENV->get_object(appendix_oop); } @@ -411,7 +412,7 @@ // for checking linkability when retrieving the associated method. ciKlass* ciBytecodeStream::get_declared_method_holder() { VM_ENTRY_MARK; - constantPoolHandle cpool(_method->get_methodOop()->constants()); + constantPoolHandle cpool(_method->get_Method()->constants()); bool ignore; // report as MethodHandle for invokedynamic, which is syntactically classless if (cur_bc() == Bytecodes::_invokedynamic) @@ -426,7 +427,7 @@ // referenced by the current bytecode. Used for generating // deoptimization information. int ciBytecodeStream::get_method_holder_index() { - constantPoolOop cpool = _method->get_methodOop()->constants(); + ConstantPool* cpool = _method->get_Method()->constants(); return cpool->klass_ref_index_at(get_method_index()); } @@ -438,7 +439,7 @@ // deoptimization information. int ciBytecodeStream::get_method_signature_index() { GUARDED_VM_ENTRY( - constantPoolOop cpool = _holder->get_instanceKlass()->constants(); + ConstantPool* cpool = _holder->get_instanceKlass()->constants(); const int method_index = get_method_index(); const int name_and_type_index = cpool->name_and_type_ref_index_at(method_index); return cpool->signature_ref_index_at(name_and_type_index); @@ -446,32 +447,12 @@ } // ------------------------------------------------------------------ -// ciBytecodeStream::get_cpcache -ciCPCache* ciBytecodeStream::get_cpcache() const { - if (_cpcache == NULL) { +// ciBytecodeStream::get_resolved_references +ciObjArray* ciBytecodeStream::get_resolved_references() { VM_ENTRY_MARK; // Get the constant pool. - constantPoolOop cpool = _holder->get_instanceKlass()->constants(); - constantPoolCacheOop cpcache = cpool->cache(); - - *(ciCPCache**)&_cpcache = CURRENT_ENV->get_object(cpcache)->as_cpcache(); - } - return _cpcache; -} + ConstantPool* cpool = _holder->get_instanceKlass()->constants(); -// ------------------------------------------------------------------ -// ciBytecodeStream::get_call_site -ciCallSite* ciBytecodeStream::get_call_site() { - VM_ENTRY_MARK; - // Get the constant pool. - constantPoolOop cpool = _holder->get_instanceKlass()->constants(); - constantPoolCacheOop cpcache = cpool->cache(); - - // Get the CallSite from the constant pool cache. - int method_index = get_method_index(); - ConstantPoolCacheEntry* cpcache_entry = cpcache->secondary_entry_at(method_index); - oop call_site_oop = cpcache_entry->f1_as_instance(); - - // Create a CallSite object and return it. - return CURRENT_ENV->get_object(call_site_oop)->as_call_site(); -} + // Create a resolved references array and return it. + return CURRENT_ENV->get_object(cpool->resolved_references())->as_obj_array(); + }