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

8069254: Warning issued despite @SafeVarargs annotation on constructor

Browse source 
The Symbol created for diamond inference does not have annotations attached - need to look for @SafeVarargs on the underlying constructor's Symbol.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2015-01-23 15:14:53 +01:00
parent 25c0dd9958
commit edc2052f33
2 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -898,7 +898,7 @@ public class Check {
Type argtype = owntype.getParameterTypes().last(); Type argtype = owntype.getParameterTypes().last();
if (!types.isReifiable(argtype) && if (!types.isReifiable(argtype) &&
(!allowSimplifiedVarargs || (!allowSimplifiedVarargs ||
sym.attribute(syms.trustMeType.tsym) == null || sym.baseSymbol().attribute(syms.trustMeType.tsym) == null ||
!isTrustMeAllowedOnMethod(sym))) { !isTrustMeAllowedOnMethod(sym))) {
warnUnchecked(env.tree.pos(), warnUnchecked(env.tree.pos(),
"unchecked.generic.array.creation", "unchecked.generic.array.creation",

43
langtools/test/tools/javac/varargs/warning/Warn6.java Normal file
View file

@ -0,0 +1,43 @@
/*
* Copyright (c) 2015, 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 8069254
* @summary Ensure the generic array creation warning is not incorrectly produced for diamonds
* @compile -Xlint:unchecked -Werror Warn6.java
*/
public class Warn6<T> {
@SafeVarargs
public Warn6(T... args) {
}
public static void main(String[] args) {
Iterable<String> i = null;
Warn6<Iterable<String>> foo2 = new Warn6<>(i, i);
Warn6<Iterable<String>> foo3 = new Warn6<Iterable<String>>(i, i);
}
}