1.1 --- a/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java Mon Jan 21 11:16:28 2013 -0800 1.2 +++ b/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java Mon Jan 21 20:13:56 2013 +0000 1.3 @@ -23,44 +23,44 @@ 1.4 1.5 @TraceResolve(keys={"compiler.err.ref.ambiguous"}) 1.6 class PrimitiveOverReferenceVarargsAmbiguous { 1.7 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.8 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.9 static void m_byte(byte... b) {} 1.10 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.11 + @Candidate(applicable=Phase.VARARGS) 1.12 static void m_byte(Byte... b) {} 1.13 1.14 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.15 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.16 static void m_short(short... s) {} 1.17 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.18 + @Candidate(applicable=Phase.VARARGS) 1.19 static void m_short(Short... s) {} 1.20 1.21 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.22 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.23 static void m_int(int... i) {} 1.24 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.25 + @Candidate(applicable=Phase.VARARGS) 1.26 static void m_int(Integer... i) {} 1.27 1.28 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.29 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.30 static void m_long(long... l) {} 1.31 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.32 + @Candidate(applicable=Phase.VARARGS) 1.33 static void m_long(Long... l) {} 1.34 1.35 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.36 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.37 static void m_float(float... f) {} 1.38 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.39 + @Candidate(applicable=Phase.VARARGS) 1.40 static void m_float(Float... f) {} 1.41 1.42 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.43 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.44 static void m_double(double... d) {} 1.45 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.46 + @Candidate(applicable=Phase.VARARGS) 1.47 static void m_double(Double... d) {} 1.48 1.49 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.50 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.51 static void m_char(char... c) {} 1.52 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.53 + @Candidate(applicable=Phase.VARARGS) 1.54 static void m_char(Character... c) {} 1.55 1.56 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.57 + @Candidate(applicable=Phase.VARARGS, mostSpecific=true) 1.58 static void m_bool(boolean... z) {} 1.59 - @Candidate(applicable=Phase.VARARGS, mostSpecific=false) 1.60 + @Candidate(applicable=Phase.VARARGS) 1.61 static void m_bool(Boolean... z) {} 1.62 1.63 {