infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 01:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8164783: SA: jhsdb clhsdb 'printall' often throws "Corrupted constant pool" assertion failure

Browse Source 
Do the special handling for invokedynamic bytecodes while printing out the bytecodes in a method

Reviewed-by: dsamersoff, sundar
This commit is contained in:
Jini George 2016-11-03 11:53:20 +05:30 committed by Vyom Tewari
parent fcdc3eac28
commit 4e3c345d78
5 changed files with 224 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2016, 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
@ -112,21 +112,28 @@ public class BytecodeInvoke extends BytecodeWithCPIndex {
buf.append('#');
buf.append(Integer.toString(indexForFieldOrMethod()));
if (isInvokedynamic()) {
buf.append('(');
buf.append(Integer.toString(index()));
buf.append(')');
ConstantPool cp = method.getConstants();
buf.append('(');
int poolIndex = cp.invokeDynamicNameAndTypeRefIndexAt(indexForFieldOrMethod());
buf.append(Integer.toString(poolIndex));
buf.append(')');
buf.append(" [Name and Type ");
buf.append(name().asString());
buf.append(":");
buf.append(signature().asString().replace('/', '.'));
} else {
buf.append(" [Method ");
StringBuffer sigBuf = new StringBuffer();
new SignatureConverter(signature(), sigBuf).iterateReturntype();
buf.append(sigBuf.toString().replace('/', '.'));
buf.append(spaces);
buf.append(name().asString());
buf.append('(');
sigBuf = new StringBuffer();
new SignatureConverter(signature(), sigBuf).iterateParameters();
buf.append(sigBuf.toString().replace('/', '.'));
buf.append(')');
}
buf.append(" [Method ");
StringBuffer sigBuf = new StringBuffer();
new SignatureConverter(signature(), sigBuf).iterateReturntype();
buf.append(sigBuf.toString().replace('/', '.'));
buf.append(spaces);
buf.append(name().asString());
buf.append('(');
sigBuf = new StringBuffer();
new SignatureConverter(signature(), sigBuf).iterateParameters();
buf.append(sigBuf.toString().replace('/', '.'));
buf.append(')');
buf.append(']');
if (code() != javaCode()) {
buf.append(spaces);

2
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
View File

@ -307,7 +307,7 @@ public class ConstantPool extends Metadata implements ClassConstants {
return member_index;
}
int invokeDynamicNameAndTypeRefIndexAt(int which) {
public int invokeDynamicNameAndTypeRefIndexAt(int which) {
// assert(tag_at(which).is_invoke_dynamic(), "Corrupted constant pool");
return extractHighShortFromInt(getIntAt(which));
}

24
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2016, 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
@ -691,17 +691,21 @@ public class HTMLGenerator implements /* imports */ ClassConstants {
} else {
buf.append(instrStr);
}
} else if(instr instanceof BytecodeInvoke) {
} else if (instr instanceof BytecodeInvoke) {
BytecodeInvoke invokeBytecode = (BytecodeInvoke) instr;
Method m = invokeBytecode.getInvokedMethod();
if (m != null) {
buf.link(genMethodHref(m), instrStr);
buf.append(" of ");
InstanceKlass klass = (InstanceKlass) m.getMethodHolder();
buf.link(genKlassHref(klass), genKlassTitle(klass));
if (invokeBytecode.isInvokedynamic()) {
buf.append(instrStr);
} else {
buf.append(instrStr);
}
Method m = invokeBytecode.getInvokedMethod();
if (m != null) {
buf.link(genMethodHref(m), instrStr);
buf.append(" of ");
InstanceKlass klass = (InstanceKlass) m.getMethodHolder();
buf.link(genKlassHref(klass), genKlassTitle(klass));
} else {
buf.append(instrStr);
}
}
} else if (instr instanceof BytecodeGetPut) {
BytecodeGetPut getPut = (BytecodeGetPut) instr;
sun.jvm.hotspot.oops.Field f = getPut.getField();

41
hotspot/test/serviceability/sa/LingeredAppWithInvokeDynamic.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import jdk.test.lib.apps.LingeredApp;
interface TestComparator {
public boolean compare(int a1, int a2);
}
public class LingeredAppWithInvokeDynamic extends LingeredApp {
public static void main(String args[]) {
Runnable r1 = () -> System.out.println("Hello");
Runnable r2 = () -> System.out.println("Hello Hello");
r1.run();
r2.run();
TestComparator testComparator = (int a1, int a2) -> {return (a1 > a2);};
boolean result = testComparator.compare(2, 5);
System.out.println(result);
LingeredApp.main(args);
}
}

146
hotspot/test/serviceability/sa/TestCpoolForInvokeDynamic.java Normal file
View File

@ -0,0 +1,146 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.util.ArrayList;
import java.util.List;
import sun.jvm.hotspot.HotSpotAgent;
import sun.jvm.hotspot.utilities.SystemDictionaryHelper;
import sun.jvm.hotspot.oops.InstanceKlass;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.oops.Method;
import sun.jvm.hotspot.utilities.MethodArray;
import sun.jvm.hotspot.ui.classbrowser.HTMLGenerator;
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.Platform;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.Asserts;
/*
* @test
* @library /test/lib
* @requires os.family != "mac"
* @modules java.base/jdk.internal.misc
* jdk.hotspot.agent/sun.jvm.hotspot
* jdk.hotspot.agent/sun.jvm.hotspot.utilities
* jdk.hotspot.agent/sun.jvm.hotspot.oops
* jdk.hotspot.agent/sun.jvm.hotspot.debugger
* jdk.hotspot.agent/sun.jvm.hotspot.ui.classbrowser
* @run main/othervm TestCpoolForInvokeDynamic
*/
public class TestCpoolForInvokeDynamic {
private static LingeredAppWithInvokeDynamic theApp = null;
private static void printBytecodes(String pid,
String[] instanceKlassNames) {
HotSpotAgent agent = new HotSpotAgent();
try {
agent.attach(Integer.parseInt(pid));
}
catch (DebuggerException e) {
System.out.println(e.getMessage());
System.err.println("Unable to connect to process ID: " + pid);
agent.detach();
e.printStackTrace();
}
for (String instanceKlassName : instanceKlassNames) {
InstanceKlass iKlass = SystemDictionaryHelper.findInstanceKlass(instanceKlassName);
MethodArray methods = iKlass.getMethods();
for (int i = 0; i < methods.length(); i++) {
Method m = methods.at(i);
System.out.println("Method: " + m.getName().asString() +
" in instance klass: " + instanceKlassName);
HTMLGenerator gen = new HTMLGenerator(false);
System.out.println(gen.genHTML(m));
}
}
agent.detach();
}
private static void createAnotherToAttach(
String[] instanceKlassNames,
long lingeredAppPid) throws Exception {
String[] toolArgs = {
"--add-modules=jdk.hotspot.agent",
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED",
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.utilities=ALL-UNNAMED",
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.oops=ALL-UNNAMED",
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.debugger=ALL-UNNAMED",
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.ui.classbrowser=ALL-UNNAMED",
"TestCpoolForInvokeDynamic",
Long.toString(lingeredAppPid)
};
// Start a new process to attach to the lingered app
ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(toolArgs);
OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder);
SAOutput.shouldHaveExitValue(0);
System.out.println(SAOutput.getOutput());
SAOutput.shouldContain("invokedynamic");
SAOutput.shouldContain("Name and Type");
SAOutput.shouldContain("run:()Ljava.lang.Runnable");
SAOutput.shouldContain("compare:()LTestComparator");
SAOutput.shouldNotContain("Corrupted constant pool");
}
public static void main (String... args) throws Exception {
String[] instanceKlassNames = new String[] {
"LingeredAppWithInvokeDynamic"
};
if (!Platform.shouldSAAttach()) {
System.out.println(
"SA attach not expected to work - test skipped.");
return;
}
if (args == null || args.length == 0) {
try {
List<String> vmArgs = new ArrayList<String>();
vmArgs.add("-XX:+UsePerfData");
vmArgs.addAll(Utils.getVmOptions());
theApp = new LingeredAppWithInvokeDynamic();
LingeredApp.startApp(vmArgs, theApp);
createAnotherToAttach(instanceKlassNames,
theApp.getPid());
} finally {
LingeredApp.stopApp(theApp);
}
} else {
printBytecodes(args[0], instanceKlassNames);
}
}
}