8209058: Cannot find annotation method 'value()' in type 'Profile+Annotation'

Correct detection of the Profile+Annotation synthetic annotation for classes that are not from the java.base module.

Reviewed-by: jjg
This commit is contained in:
Jan Lahoda 2018-09-21 12:29:46 +02:00
parent c1033edca8
commit 3f43390b8b
2 changed files with 40 additions and 4 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac/jvm
test/langtools/tools/javac/platform

@ -1639,9 +1639,9 @@ public class ClassReader {
}
ListBuffer<CompoundAnnotationProxy> proxies = new ListBuffer<>();
for (CompoundAnnotationProxy proxy : annotations) {
if (proxy.type.tsym == syms.proprietaryType.tsym)
if (proxy.type.tsym.flatName() == syms.proprietaryType.tsym.flatName())
sym.flags_field |= PROPRIETARY;
else if (proxy.type.tsym == syms.profileType.tsym) {
else if (proxy.type.tsym.flatName() == syms.profileType.tsym.flatName()) {
if (profile != Profile.DEFAULT) {
for (Pair<Name, Attribute> v : proxy.values) {
if (v.fst == names.value && v.snd instanceof Attribute.Constant) {
@ -2645,8 +2645,6 @@ public class ClassReader {
}
protected ClassSymbol enterClass(Name name) {
if (syms.proprietaryType.tsym.flatName() == name)
return (ClassSymbol) syms.proprietaryType.tsym;
return syms.enterClass(currentModule, name);
}

@ -0,0 +1,38 @@
/*
* Copyright (c) 2018, 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 8209058
* @summary Verify the synthetic Profile+Annotation is ignored when using --release
* @modules java.compiler
* @compile -Xlint:all -Werror --release 10 NoProfileAnnotationWarning.java
*/
import javax.annotation.processing.ProcessingEnvironment;
public class NoProfileAnnotationWarning {
void t(ProcessingEnvironment pe) {
pe.getElementUtils().getTypeElement("a");
}
}