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

8166367: Missing ExceptionTable attribute in anonymous class constructors

Browse source 
Reviewed-by: vromero
This commit is contained in:
Srikanth Adayapalam 2016-10-26 11:22:50 +05:30
parent 3368f5a621
commit 5bc203a934
2 changed files with 75 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
View file

@ -853,9 +853,9 @@ public class Flow {
List<Type> caughtPrev = caught;
ListBuffer<FlowPendingExit> pendingExitsPrev = pendingExits;
Lint lintPrev = lint;
boolean anonymousClass = tree.name == names.empty;
pendingExits = new ListBuffer<>();
if (tree.name != names.empty) {
if (!anonymousClass) {
caught = List.nil();
}
classDef = tree;
@ -874,7 +874,7 @@ public class Flow {
// add intersection of all thrown clauses of initial constructors
// to set of caught exceptions, unless class is anonymous.
if (tree.name != names.empty) {
if (!anonymousClass) {
boolean firstConstructor = true;
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
if (TreeInfo.isInitialConstructor(l.head)) {
@ -905,10 +905,11 @@ public class Flow {
// Changing the throws clause on the fly is okay here because
// the anonymous constructor can't be invoked anywhere else,
// and its type hasn't been cached.
if (tree.name == names.empty) {
if (anonymousClass) {
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
if (TreeInfo.isInitialConstructor(l.head)) {
if (TreeInfo.isConstructor(l.head)) {
JCMethodDecl mdef = (JCMethodDecl)l.head;
scan(mdef);
mdef.thrown = make.Types(thrown);
mdef.sym.type = types.createMethodTypeWithThrown(mdef.sym.type, thrown);
}
@ -918,6 +919,8 @@ public class Flow {
// process all the methods
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
if (anonymousClass && TreeInfo.isConstructor(l.head))
continue; // there can never be an uncaught exception.
if (l.head.hasTag(METHODDEF)) {
scan(l.head);
errorUncaught();

67
langtools/test/tools/javac/AnonymousClass/AnonymousCtorExceptionTest.java Normal file
View file

@ -0,0 +1,67 @@
/*
* 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.
*/
/*
* @test
* @bug 8166367
* @summary Missing ExceptionTable attribute in anonymous class constructors
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JavapTask
* @run compile -g AnonymousCtorExceptionTest.java
* @run main AnonymousCtorExceptionTest
*/
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.JavapTask;
import toolbox.Task;
import toolbox.ToolBox;
public class AnonymousCtorExceptionTest {
AnonymousCtorExceptionTest() throws IOException {
}
public static void main(String args[]) throws Exception {
new AnonymousCtorExceptionTest() {
};
ToolBox tb = new ToolBox();
Path classPath = Paths.get(ToolBox.testClasses, "AnonymousCtorExceptionTest$1.class");
String javapOut = new JavapTask(tb)
.options("-v", "-p")
.classes(classPath.toString())
.run()
.getOutput(Task.OutputKind.DIRECT);
if (!javapOut.contains("AnonymousCtorExceptionTest$1() throws java.io.IOException;"))
throw new AssertionError("Unexpected output " + javapOut);
if (!javapOut.contains("Exceptions:"))
throw new AssertionError("Unexpected output " + javapOut);
}
}