infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 18:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8172880: Incorrect line number for NPE generated by instance-bound method reference

Browse Source 
Synthetic null checks should have a LineNumberTable entry.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2017-05-31 14:51:02 +02:00
parent 391c99a5ec
commit 98b63e6826
2 changed files with 93 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
View File

@ -1894,7 +1894,7 @@ public class Gen extends JCTree.Visitor {
case NULLCHK:
result = od.load();
code.emitop0(dup);
genNullCheck(tree.pos());
genNullCheck(tree);
break;
default:
Assert.error();
@ -1903,12 +1903,13 @@ public class Gen extends JCTree.Visitor {
}
/** Generate a null check from the object value at stack top. */
private void genNullCheck(DiagnosticPosition pos) {
private void genNullCheck(JCTree tree) {
code.statBegin(tree.pos);
if (allowBetterNullChecks) {
callMethod(pos, syms.objectsType, names.requireNonNull,
callMethod(tree.pos(), syms.objectsType, names.requireNonNull,
List.of(syms.objectType), true);
} else {
callMethod(pos, syms.objectType, names.getClass,
callMethod(tree.pos(), syms.objectType, names.getClass,
List.nil(), false);
}
code.emitop0(pop);
@ -2087,7 +2088,7 @@ public class Gen extends JCTree.Visitor {
base.drop();
} else {
base.load();
genNullCheck(tree.selected.pos());
genNullCheck(tree.selected);
}
result = items.
makeImmediateItem(sym.type, ((VarSymbol) sym).getConstValue());

87
langtools/test/tools/javac/linenumbers/NullCheckLineNumberTest.java Normal file
View File

@ -0,0 +1,87 @@
/*
* @test /nodynamiccopyright/
* @bug 8172880
* @summary Wrong LineNumberTable for synthetic null checks
* @modules jdk.jdeps/com.sun.tools.classfile
*/
import com.sun.tools.classfile.ClassFile;
import com.sun.tools.classfile.ConstantPoolException;
import com.sun.tools.classfile.Method;
import com.sun.tools.classfile.Attribute;
import com.sun.tools.classfile.Code_attribute;
import com.sun.tools.classfile.LineNumberTable_attribute;
import java.io.IOException;
import java.util.AbstractMap.SimpleEntry;
import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class NullCheckLineNumberTest {
//test data:
static class Test {
public Test() {
String a = "", b = null;
Stream.of("x")
.filter(a::equals)
.filter(b::equals)
.count();
}
}
public static void main(String[] args) throws Exception {
List<Entry> actualEntries = findEntries();
List<Entry> expectedEntries = List.of(
new SimpleEntry<>(29, 0),
new SimpleEntry<>(30, 4),
new SimpleEntry<>(32, 9),
new SimpleEntry<>(33, 16),
new SimpleEntry<>(34, 32),
new SimpleEntry<>(35, 46),
new SimpleEntry<>(36, 52)
);
if (!Objects.equals(actualEntries, expectedEntries)) {
error(String.format("Unexpected LineNumberTable: %s", actualEntries.toString()));
}
try {
new Test();
} catch (NullPointerException npe) {
if (Arrays.stream(npe.getStackTrace())
.noneMatch(se -> se.getFileName().contains("NullCheckLineNumberTest") &&
se.getLineNumber() == 34)) {
throw new AssertionError("Should go through line 34!");
}
}
}
static List<Entry> findEntries() throws IOException, ConstantPoolException {
ClassFile self = ClassFile.read(NullCheckLineNumberTest.Test.class.getResourceAsStream("NullCheckLineNumberTest$Test.class"));
for (Method m : self.methods) {
if ("<init>".equals(m.getName(self.constant_pool))) {
Code_attribute code_attribute = (Code_attribute)m.attributes.get(Attribute.Code);
for (Attribute at : code_attribute.attributes) {
if (Attribute.LineNumberTable.equals(at.getName(self.constant_pool))) {
return Arrays.stream(((LineNumberTable_attribute)at).line_number_table)
.map(e -> new SimpleEntry<> (e.line_number, e.start_pc))
.collect(Collectors.toList());
}
}
}
}
return null;
}
static void error(String msg) {
throw new AssertionError(msg);
}
}