Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20161220

 Conflicts:
	bincompat-backward.whitelist.conf
	build.xml
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/library/scala/collection/immutable/NumericRange.scala

1 files changed, 33 insertions, 0 deletions

diff --git a/test/files/run/t3236/AnnotationTest.scala b/test/files/run/t3236/AnnotationTest.scala
new file mode 100644
index 0000000000..c2f9ae7837
--- /dev/null
+++ b/test/files/run/t3236/AnnotationTest.scala
@@ -0,0 +1,33 @@
+trait AnnotationTest {
+  @BooleanAnnotation(Constants.BooleanTrue)
+  @ByteAnnotation(Constants.Byte)
+  @CharAnnotation(Constants.Char)
+  @ShortAnnotation(Constants.Short)
+  @IntAnnotation(Constants.Int)
+  @LongAnnotation(Constants.Long)
+  @FloatAnnotation(Constants.Float)
+  @DoubleAnnotation(Constants.Double)
+  @StringAnnotation(Constants.String)
+  def test1: Unit
+
+  @BooleanAnnotation(Constants.InvertedBoolean)
+  @ByteAnnotation(Constants.NegativeByte)
+  @ShortAnnotation(Constants.NegativeShort)
+  @IntAnnotation(Constants.NegativeInt)
+  @LongAnnotation(Constants.NegativeLong)
+  @FloatAnnotation(Constants.NegativeFloat)
+  @DoubleAnnotation(Constants.NegativeDouble)
+  @StringAnnotation(Constants.NegativeString)
+  def test2: Unit
+
+  @BooleanAnnotation(Constants.BooleanFalse)
+  @ByteAnnotation(Constants.LiteralCharAsByte)
+  @CharAnnotation(Constants.LiteralChar)
+  @ShortAnnotation(Constants.LiteralCharAsShort)
+  @IntAnnotation(Constants.LiteralCharAsInt)
+  @LongAnnotation(Constants.LiteralCharAsLong)
+  def test3: Unit
+
+  @LongAnnotation(Constants.LiteralIntAsLong)
+  def test4: Unit
+}