Mercurial > hg > graal-jvmci-8
diff jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java @ 22488:b5ebb80da4f1
Correct formatting
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Sun, 30 Aug 2015 20:15:02 -0700 |
parents | a0e5714d5436 |
children | 575eb1036ea9 |
line wrap: on
line diff
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java Fri Aug 28 12:42:06 2015 -1000 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java Sun Aug 30 20:15:02 2015 -0700 @@ -370,7 +370,7 @@ * @return name as {@link String} */ private String getNameRefAt(int index) { - return runtime().getCompilerToVM().lookupNameRefInPool(this, index); + return runtime().getCompilerToVM().lookupNameRefInPool(this, index); } /** @@ -394,7 +394,7 @@ * @return signature as {@link String} */ private String getSignatureRefAt(int index) { - return runtime().getCompilerToVM().lookupSignatureRefInPool(this, index); + return runtime().getCompilerToVM().lookupSignatureRefInPool(this, index); } /** @@ -417,7 +417,7 @@ * @return klass reference index */ private int getKlassRefIndexAt(int index) { - return runtime().getCompilerToVM().lookupKlassRefIndexInPool(this, index); + return runtime().getCompilerToVM().lookupKlassRefIndexInPool(this, index); } /** @@ -428,10 +428,10 @@ * @return klass reference index */ private int getUncachedKlassRefIndexAt(int index) { - assertTagIsFieldOrMethod(index); - final int refIndex = unsafe.getInt(getMetaspaceConstantPool() + runtime().getConfig().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize); - // klass ref index is in the low 16-bits. - return refIndex & 0xFFFF; + assertTagIsFieldOrMethod(index); + final int refIndex = unsafe.getInt(getMetaspaceConstantPool() + runtime().getConfig().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize); + // klass ref index is in the low 16-bits. + return refIndex & 0xFFFF; } /** @@ -631,8 +631,8 @@ break; case Bytecodes.INVOKEDYNAMIC: { // invokedynamic instructions point to a constant pool cache entry. - index = decodeConstantPoolCacheIndex(cpi) + runtime().getConfig().constantPoolCpCacheIndexTag; - index = runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); + index = decodeConstantPoolCacheIndex(cpi) + runtime().getConfig().constantPoolCpCacheIndexTag; + index = runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); break; } case Bytecodes.GETSTATIC: @@ -644,8 +644,8 @@ case Bytecodes.INVOKESTATIC: case Bytecodes.INVOKEINTERFACE: { // invoke and field instructions point to a constant pool cache entry. - index = rawIndexToConstantPoolIndex(cpi, opcode); - index = runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); + index = rawIndexToConstantPoolIndex(cpi, opcode); + index = runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); break; } default: