infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-18 11:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

8171528: Crash in Annotate with duplicate package-info declarations

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2017-01-12 15:59:28 -08:00
parent a709f5c3ef
commit 5fc51d4ecd
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -47,6 +47,7 @@ import java.util.*;
import static com.sun.tools.javac.code.Flags.SYNTHETIC;
import static com.sun.tools.javac.code.Kinds.Kind.MDL;
import static com.sun.tools.javac.code.Kinds.Kind.MTH;
import static com.sun.tools.javac.code.Kinds.Kind.PCK;
import static com.sun.tools.javac.code.Kinds.Kind.VAR;
import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
import static com.sun.tools.javac.code.TypeTag.ARRAY;
@ -228,7 +229,14 @@ public class Annotate {
s.resetAnnotations(); // mark Annotations as incomplete for now
normal(() -> {
Assert.check(s.annotationsPendingCompletion());
// Packages are unusual, in that they are the only type of declaration that can legally appear
// more than once in a compilation, and in all cases refer to the same underlying symbol.
// This means they are the only kind of declaration that syntactically may have multiple sets
// of annotations, each on a different package declaration, even though that is ultimately
// forbidden by JLS 8 section 7.4.
// The corollary here is that all of the annotations on a package symbol may have already
// been handled, meaning that the set of annotations pending completion is now empty.
Assert.check(s.kind == PCK || s.annotationsPendingCompletion());
JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
DiagnosticPosition prevLintPos =
deferPos != null

6
langtools/test/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.java Normal file
View File

@ -0,0 +1,6 @@
/*
* @test /nodynamiccopyright/
* @bug 8171528
* @summary Crash in Annotate with duplicate package-info declarations
* @compile/fail/ref=DuplicatedAnnotatedPackagesTest.out -XDrawDiagnostics pkg1/package-info.java pkg2/package-info.java
*/

4
langtools/test/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out Normal file
View File

@ -0,0 +1,4 @@
package-info.java:2:9: compiler.warn.pkg-info.already.seen: test
package-info.java:1:1: compiler.err.already.annotated: kindname.package, test
1 error
1 warning

2
langtools/test/tools/javac/T8171528/pkg1/package-info.java Normal file
View File

@ -0,0 +1,2 @@
@Deprecated
package test;

2
langtools/test/tools/javac/T8171528/pkg2/package-info.java Normal file
View File

@ -0,0 +1,2 @@
@Deprecated
package test;