stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8180660: missing LNT entry for finally block

Browse Source 
Co-authored-by: Maurizio Cimadamore <maurizio.cimadamore@oracle.com>
Reviewed-by: mcimadamore, vromero
This commit is contained in:
Vicente Romero 2017-05-22 12:49:05 -07:00
parent b8f2a6edad
commit 32e18391c5
5 changed files with 220 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
package com.sun.tools.javac.jvm;
import com.sun.tools.javac.tree.TreeInfo.PosKind;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.List;
@ -1399,12 +1400,16 @@ public class Gen extends JCTree.Visitor {
catchallpc, 0);
startseg = env.info.gaps.next().intValue();
}
code.statBegin(TreeInfo.finalizerPos(env.tree));
code.statBegin(TreeInfo.finalizerPos(env.tree, PosKind.FIRST_STAT_POS));
code.markStatBegin();
Item excVar = makeTemp(syms.throwableType);
excVar.store();
genFinalizer(env);
code.resolvePending();
code.statBegin(TreeInfo.finalizerPos(env.tree, PosKind.END_POS));
code.markStatBegin();
excVar.load();
registerCatch(body.pos(), startseg,
env.info.gaps.next().intValue(),
@ -1418,7 +1423,7 @@ public class Gen extends JCTree.Visitor {
code.resolve(env.info.cont);
// Mark statement line number
code.statBegin(TreeInfo.finalizerPos(env.tree));
code.statBegin(TreeInfo.finalizerPos(env.tree, PosKind.FIRST_STAT_POS));
code.markStatBegin();
// Save return address.

24
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2017, 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
@ -46,6 +46,8 @@ import static com.sun.tools.javac.tree.JCTree.Tag.SYNCHRONIZED;
import javax.tools.JavaFileObject;
import java.util.function.ToIntFunction;
import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.LEFT;
import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.RIGHT;
@ -580,13 +582,29 @@ public class TreeInfo {
};
}
public enum PosKind {
START_POS(TreeInfo::getStartPos),
FIRST_STAT_POS(TreeInfo::firstStatPos),
END_POS(TreeInfo::endPos);
final ToIntFunction<JCTree> posFunc;
PosKind(ToIntFunction<JCTree> posFunc) {
this.posFunc = posFunc;
}
int toPos(JCTree tree) {
return posFunc.applyAsInt(tree);
}
}
/** The position of the finalizer of given try/synchronized statement.
*/
public static int finalizerPos(JCTree tree) {
public static int finalizerPos(JCTree tree, PosKind posKind) {
if (tree.hasTag(TRY)) {
JCTry t = (JCTry) tree;
Assert.checkNonNull(t.finalizer);
return firstStatPos(t.finalizer);
return posKind.toPos(t.finalizer);
} else if (tree.hasTag(SYNCHRONIZED)) {
return endPos(((JCSynchronized) tree).body);
} else {

3
langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, 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
@ -72,6 +72,7 @@ public class InlinedFinallyConfuseDebuggersTest {
{9, 21}, //System.out.println("finally");
{10, 29},
{9, 32}, //System.out.println("finally");
{10, 41}, //}
{11, 43},
};

180
langtools/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java Normal file
View File

@ -0,0 +1,180 @@
/*
* Copyright (c) 2017, 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.
*/
/*
* @test
* @bug 8180141
* @summary Missing entry in LineNumberTable for break statement that jumps out of try-finally
* @modules jdk.jdeps/com.sun.tools.classfile
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
* @compile -g MissingLNTEntryForFinalizerTest.java
* @run main MissingLNTEntryForFinalizerTest
*/
import java.io.File;
import java.net.URI;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
import com.sun.tools.classfile.*;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
import com.sun.tools.javac.comp.Modules;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.main.JavaCompiler;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
import static com.sun.tools.javac.util.List.of;
import static com.sun.tools.javac.tree.JCTree.Tag.*;
public class MissingLNTEntryForFinalizerTest {
protected ReusableJavaCompiler tool;
Context context;
MissingLNTEntryForFinalizerTest() {
context = new Context();
JavacFileManager.preRegister(context);
MyAttr.preRegister(context);
tool = new ReusableJavaCompiler(context);
}
public static void main(String... args) throws Throwable {
new MissingLNTEntryForFinalizerTest().test();
}
void test() throws Throwable {
JavaSource source = new JavaSource("1");
tool.clear();
List<JavaFileObject> inputs = of(source);
try {
tool.compile(inputs);
} catch (Throwable ex) {
throw new AssertionError(ex);
}
File testClasses = new File(".");
File file = new File(testClasses, "Test1.class");
ClassFile classFile = ClassFile.read(file);
for (Method m : classFile.methods) {
if (classFile.constant_pool.getUTF8Value(m.name_index).equals("foo")) {
Code_attribute code = (Code_attribute)m.attributes.get(Attribute.Code);
LineNumberTable_attribute lnt = (LineNumberTable_attribute)code.attributes.get(Attribute.LineNumberTable);
checkLNT(lnt, MyAttr.lineNumber);
}
}
}
void checkLNT(LineNumberTable_attribute lnt, int lineToCheckFor) {
for (LineNumberTable_attribute.Entry e: lnt.line_number_table) {
if (e.line_number == lineToCheckFor) {
return;
}
}
throw new AssertionError("seek line number not found in the LNT for method foo()");
}
class JavaSource extends SimpleJavaFileObject {
String id;
String template =
"import java.util.*;\n" +
"class Test#Id {\n" +
" void foo() {\n" +
" List<String> l = null;\n" +
" String first = null;\n" +
" try {\n" +
" first = l.get(0);\n" +
" } finally {\n" +
" if (first != null) {\n" +
" System.out.println(\"finalizer\");\n" +
" }\n" +
" }\n" +
" }\n" +
"}";
JavaSource(String id) {
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
this.id = id;
}
@Override
public CharSequence getCharContent(boolean ignoreEncodingErrors) {
return template.replace("#Id", id);
}
}
/* this class has been set up to do not depend on a fixed line number, this Attr subclass will
* look for 'break' or 'continue' statements in order to find the actual line number they occupy.
* This way the test can find if that line number appears in the LNT generated for a given class.
*/
static class MyAttr extends Attr {
static int lineNumber;
static void preRegister(Context context) {
context.put(attrKey, (com.sun.tools.javac.util.Context.Factory<Attr>) c -> new MyAttr(c));
}
MyAttr(Context context) {
super(context);
}
@Override
public com.sun.tools.javac.code.Type attribStat(JCTree tree, Env<AttrContext> env) {
com.sun.tools.javac.code.Type result = super.attribStat(tree, env);
if (tree.hasTag(TRY)) {
JCTry tryTree = (JCTry)tree;
lineNumber = env.toplevel.lineMap.getLineNumber(tryTree.finalizer.endpos);
}
return result;
}
}
static class ReusableJavaCompiler extends JavaCompiler {
ReusableJavaCompiler(Context context) {
super(context);
}
@Override
protected void checkReusable() {
// do nothing
}
@Override
public void close() {
//do nothing
}
void clear() {
newRound();
Modules.instance(context).newRound();
}
}
}

15
langtools/test/tools/javac/linenumbers/FinallyLineNumberTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, 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
@ -36,7 +36,6 @@ import com.sun.tools.classfile.Code_attribute;
import com.sun.tools.classfile.LineNumberTable_attribute;
import com.sun.tools.classfile.LineNumberTable_attribute.Entry;
import java.io.File;
import java.io.IOException;
public class FinallyLineNumberTest {
@ -46,13 +45,13 @@ public class FinallyLineNumberTest {
if (lines == null) {
throw new Exception("finally line number table could not be loaded");
}
if (lines.length != 4) {
if (lines.length != 5) {
// Help debug
System.err.println("LineTable error, got lines:");
for (Entry e : lines) {
System.err.println(e.line_number);
}
throw new Exception("finally line number table incorrect: length=" + lines.length + " expected length=4");
throw new Exception("finally line number table incorrect: length=" + lines.length + " expected length=5");
}
// return null line, for the load null operation
@ -71,11 +70,17 @@ public class FinallyLineNumberTest {
throw new Exception("finally line number table incorrect: got=" + current + " expected=" + first);
}
// finally line, for when exception is thrown
// for when exception is thrown
current = lines[3].line_number;
if (current != first + 2) {
throw new Exception("finally line number table incorrect: got=" + current + " expected=" + (first + 2));
}
// the '}' closing the finally block
current = lines[4].line_number;
if (current != first + 3) {
throw new Exception("finally line number table incorrect: got=" + current + " expected=" + (first + 3));
}
}
static Entry[] findEntries() throws IOException, ConstantPoolException {