Merge commit '81d8f9d3da' into merge-210

* excluded from merge:

  [nomerge] SI-6667 Demote a new ambiguity error to a lint warning.
  Revert "SI-6422: add missing Fractional and Integral alias in scala package"
  [backport] SI-6482, lost bounds in extension methods.

* commit '81d8f9d3da': (31 commits)
  reflecting @throws defined in Scala code
  pullrequest feedback
  SI-5833 Fixes tail-of-Nil problem in RefinedType#normalizeImpl
  SI-6017 Scaladoc: Show all letters without dangling links
  SI-6017 Generate Scaladoc's index links in Scala side
  SI-5313 Minor code cleanup for store clobbering
  SI-5313 Test clobbers on the back edge of a loop
  SI-7033 Be symful when creating factory methods.
  SI-7022 Additional test case for value class w. bounds
  SI-7039 unapplySeq result type independent of subpattern count
  evicts javac-artifacts.jar
  SI-7008 @throws annotations are now populated in reflect
  Fix SI-6578. Deprecated `askType` because of possible race conditions in type checker.
  SI-7029 - Make test more robust
  SI-7029 - Makes sure that uncaught exceptions are propagated to the UEH for the global ExecutionContext
  SI-6941 tests
  SI-6686 drop valdef unused in flatMapCond's block
  ...

Conflicts:
	src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/reflect/scala/reflect/internal/Definitions.scala

1 files changed, 47 insertions, 0 deletions

diff --git a/test/files/run/reflection-java-annotations/JavaAnnottee_1.java b/test/files/run/reflection-java-annotations/JavaAnnottee_1.java
new file mode 100644
index 0000000000..b241f5d25e
--- /dev/null
+++ b/test/files/run/reflection-java-annotations/JavaAnnottee_1.java
@@ -0,0 +1,47 @@
+@JavaComplexAnnotation_1(
+  v1 = (byte)1,
+  v2 = (short)2,
+  v3 = (char)3,
+  v4 = (int)4,
+  v5 = (long)5,
+  v6 = (float)6,
+  v7 = (double)7,
+  v10 = "hello",
+  v11 = JavaAnnottee_1.class,
+  v12 = JavaSimpleEnumeration_1.FOO,
+  v13 = @JavaSimpleAnnotation_1(
+    v1 = (byte)11,
+    v2 = (short)12,
+    v3 = (char)13,
+    v4 = (int)14,
+    v5 = (long)15,
+    v6 = (float)16,
+    v7 = (double)17,
+    v10 = "world1",
+    v11 = JavaSimpleAnnotation_1.class,
+    v12 = JavaSimpleEnumeration_1.FOO
+  ),
+  v101 = {(byte)101, (byte)101},
+  v102 = {(short)102, (short)102},
+  v103 = {(char)103, (char)103},
+  v104 = {(int)104, (int)104},
+  v105 = {(long)105, (long)105},
+  v106 = {(float)106, (float)106},
+  v107 = {(double)107, (double)107},
+  v108 = {false, true},
+  v110 = {"hello", "world"},
+  v111 = {JavaSimpleAnnotation_1.class, JavaComplexAnnotation_1.class},
+  v112 = {JavaSimpleEnumeration_1.FOO, JavaSimpleEnumeration_1.BAR},
+  v113 = {@JavaSimpleAnnotation_1(
+    v1 = (byte)21,
+    v2 = (short)22,
+    v3 = (char)23,
+    v4 = (int)24,
+    v5 = (long)25,
+    v6 = (float)26,
+    v7 = (double)27,
+    v10 = "world2",
+    v11 = JavaComplexAnnotation_1.class,
+    v12 = JavaSimpleEnumeration_1.BAR
+  )})
+public class JavaAnnottee_1 {}
\ No newline at end of file