Mercurial > hg > truffle
diff agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java @ 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 | 0a8e0d4345b3 |
| children |
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java Fri Aug 31 16:39:35 2012 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java Sat Sep 01 13:25:18 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -55,8 +55,7 @@ public Symbol name() { ConstantPool cp = method().getConstants(); if (isInvokedynamic()) { - int[] nt = cp.getNameAndTypeAt(indexForFieldOrMethod()); - return cp.getSymbolAt(nt[0]); + return cp.uncachedGetNameRefAt(indexForFieldOrMethod()); } return cp.getNameRefAt(index()); } @@ -65,20 +64,11 @@ public Symbol signature() { ConstantPool cp = method().getConstants(); if (isInvokedynamic()) { - int[] nt = cp.getNameAndTypeAt(indexForFieldOrMethod()); - return cp.getSymbolAt(nt[1]); + return cp.uncachedGetSignatureRefAt(indexForFieldOrMethod()); } return cp.getSignatureRefAt(index()); } - public int getSecondaryIndex() { - if (isInvokedynamic()) { - // change byte-ordering of 4-byte integer - return VM.getVM().getBytes().swapInt(javaSignedWordAt(1)); - } - return super.getSecondaryIndex(); // throw an error - } - public Method getInvokedMethod() { return method().getConstants().getMethodRefAt(index()); } @@ -123,7 +113,7 @@ buf.append(Integer.toString(indexForFieldOrMethod())); if (isInvokedynamic()) { buf.append('('); - buf.append(Integer.toString(getSecondaryIndex())); + buf.append(Integer.toString(index())); buf.append(')'); } buf.append(" [Method ");