archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8032247: SA: Constantpool lookup for invokedynamic is not implemented

Browse source 
Implement constant pool lookup for invokedynamic

Reviewed-by: sla, sspitsyn
This commit is contained in:
Dmitry Samersoff 2014-01-27 13:46:54 +04:00
parent 30bac4bcc7
commit ebf3cad435
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -152,7 +152,7 @@ public class ConstantPool extends Metadata implements ClassConstants {
private long indexOffset(long index) { private long indexOffset(long index) {
if (Assert.ASSERTS_ENABLED) { if (Assert.ASSERTS_ENABLED) {
Assert.that(index > 0 && index < getLength(), "invalid cp index " + index + " " + getLength()); Assert.that(index >= 0 && index < getLength(), "invalid cp index " + index + " " + getLength());
} }
return (index * getElementSize()) + headerSize; return (index * getElementSize()) + headerSize;
} }

9
hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -98,11 +98,14 @@ public class ByteCodeRewriter
break; break;
default: throw new IllegalArgumentException(); default: throw new IllegalArgumentException();
} }
if (cpCache == null) { if (cpCache == null) {
return (short) cpCacheIndex; return (short) cpCacheIndex;
} else if (fmt.indexOf("JJJJ") >= 0) { } else if (fmt.indexOf("JJJJ") >= 0) {
// change byte-ordering and go via secondary cache entry // Invokedynamic require special handling
throw new InternalError("unimplemented"); cpCacheIndex = ~cpCacheIndex;
cpCacheIndex = bytes.swapInt(cpCacheIndex);
return (short) cpCache.getEntryAt(cpCacheIndex).getConstantPoolIndex();
} else if (fmt.indexOf("JJ") >= 0) { } else if (fmt.indexOf("JJ") >= 0) {
// change byte-ordering and go via cache // change byte-ordering and go via cache
return (short) cpCache.getEntryAt((int) (0xFFFF & bytes.swapShort((short)cpCacheIndex))).getConstantPoolIndex(); return (short) cpCache.getEntryAt((int) (0xFFFF & bytes.swapShort((short)cpCacheIndex))).getConstantPoolIndex();