1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8144552: java/lang/StackWalker/LocalsAndOperands.java fails with java.lang.NullPointerException

Browse Source 
Update test case to expect null

Reviewed-by: mchung, dfuchs
This commit is contained in:
Brent Christian 2016-01-08 13:14:30 -08:00
parent 7ec6ed7ce4
commit a75216a09c
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/java.base/share/classes/java/lang/LiveStackFrame.java
View File

@ -61,6 +61,9 @@ interface LiveStackFrame extends StackFrame {
* local variable array is an {@link PrimitiveValue} object;
* otherwise, the element is an {@code Object}.
*
* <p>The returned array may contain null entries if a local variable is not
* live.
*
* @return the local variable array of this stack frame.
*/
public Object[] getLocals();

24
jdk/test/java/lang/StackWalker/LocalsAndOperands.java
View File

@ -86,29 +86,43 @@ public class LocalsAndOperands {
System.out.println("frame: " + f);
Object[] locals = (Object[]) getLocals.invoke(f);
for (int i = 0; i < locals.length; i++) {
System.out.format("local %d: %s type %s%n", i, locals[i], type(locals[i]));
System.out.format(" local %d: %s type %s\n", i, locals[i], type(locals[i]));
// check for non-null locals in LocalsAndOperands.test()
if (f.getClassName().equals("LocalsAndOperands") &&
f.getMethodName().equals("test")) {
if (locals[i] == null) {
throw new RuntimeException("kept-alive locals should not be null");
}
}
}
Object[] operands = (Object[]) getOperands.invoke(f);
for (int i = 0; i < operands.length; i++) {
System.out.format("operand %d: %s type %s%n", i, operands[i], type(operands[i]));
System.out.format(" operand %d: %s type %s%n", i, operands[i],
type(operands[i]));
}
Object[] monitors = (Object[]) getMonitors.invoke(f);
for (int i = 0; i < monitors.length; i++) {
System.out.format("monitor %d: %s%n", i, monitors[i]);
System.out.format(" monitor %d: %s%n", i, monitors[i]);
}
}
} else {
for (StackFrame f : frames) {
if (liveStackFrameClass.isInstance(f))
if (liveStackFrameClass.isInstance(f)) {
throw new RuntimeException("should not be LiveStackFrame");
}
}
}
// Use local variables so they stay alive
System.out.println("Stayin' alive: "+x+" "+c+" "+hi+" "+l+" "+d);
}
String type(Object o) throws Exception {
if (primitiveValueClass.isInstance(o)) {
if (o == null) {
return "null";
} else if (primitiveValueClass.isInstance(o)) {
char c = (char)primitiveType.invoke(o);
return String.valueOf(c);
} else {