Mercurial > hg > truffle
diff src/share/vm/ci/ciMethodHandle.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 | 1d7922586cf6 |
| children |
line wrap: on
line diff
--- a/src/share/vm/ci/ciMethodHandle.cpp Fri Aug 31 16:39:35 2012 -0700 +++ b/src/share/vm/ci/ciMethodHandle.cpp Sat Sep 01 13:25:18 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -36,6 +36,11 @@ VM_ENTRY_MARK; oop form_oop = java_lang_invoke_MethodHandle::form(get_oop()); oop vmentry_oop = java_lang_invoke_LambdaForm::vmentry(form_oop); - oop vmtarget_oop = java_lang_invoke_MemberName::vmtarget(vmentry_oop); - return CURRENT_ENV->get_object(vmtarget_oop)->as_method(); + // FIXME: Share code with ciMemberName::get_vmtarget + Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(vmentry_oop); + if (vmtarget->is_method()) + return CURRENT_ENV->get_method((Method*) vmtarget); + // FIXME: What if the vmtarget is a Klass? + assert(false, ""); + return NULL; }