Merge pull request #2021 from gkossakowski/issue/SI-7009

SI-7009: `@throws` annotation synthesized incorrectly

4 files changed, 85 insertions, 0 deletions

diff --git a/test/files/jvm/throws-annot-from-java.check b/test/files/jvm/throws-annot-from-java.check
new file mode 100644
index 0000000000..be3ba412f8
--- /dev/null
+++ b/test/files/jvm/throws-annot-from-java.check
@@ -0,0 +1,47 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> :power
+** Power User mode enabled - BEEP WHIR GYVE **
+** :phase has been set to 'typer'.          **
+** scala.tools.nsc._ has been imported      **
+** global._, definitions._ also imported    **
+** Try  :help, :vals, power.<tab>           **
+
+scala> :paste
+// Entering paste mode (ctrl-D to finish)
+
+{
+  val clazz = rootMirror.getClassByName(newTermName("test.ThrowsDeclaration_2"));
+  {
+  	val method = clazz.info.member(newTermName("foo"))
+  	val throwsAnn = method.annotations.head
+  	val atp = throwsAnn.atp
+  	println("foo")
+  	println("atp.typeParams.isEmpty: " + atp.typeParams.isEmpty)
+  	println(throwsAnn)
+  }
+  println
+
+  {
+  	val method = clazz.info.member(newTermName("bar"))
+  	val throwsAnn = method.annotations.head
+  	val Literal(const) = throwsAnn.args.head
+  	val tp = const.typeValue
+  	println("bar")
+  	println("tp.typeParams.isEmpty: " + tp.typeParams.isEmpty)
+  	println(throwsAnn)
+  }
+}
+
+// Exiting paste mode, now interpreting.
+
+foo
+atp.typeParams.isEmpty: true
+throws[IllegalStateException](classOf[java.lang.IllegalStateException])
+
+bar
+tp.typeParams.isEmpty: true
+throws[test.PolymorphicException[_]](classOf[test.PolymorphicException])
+
+scala> 
diff --git a/test/files/jvm/throws-annot-from-java/PolymorphicException_1.scala b/test/files/jvm/throws-annot-from-java/PolymorphicException_1.scala
new file mode 100644
index 0000000000..58fa536f0b
--- /dev/null
+++ b/test/files/jvm/throws-annot-from-java/PolymorphicException_1.scala
@@ -0,0 +1,3 @@
+package test
+
+class PolymorphicException[T] extends Exception
diff --git a/test/files/jvm/throws-annot-from-java/Test_3.scala b/test/files/jvm/throws-annot-from-java/Test_3.scala
new file mode 100644
index 0000000000..de1d984573
--- /dev/null
+++ b/test/files/jvm/throws-annot-from-java/Test_3.scala
@@ -0,0 +1,29 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+	def code = """:power
+:paste
+{
+  val clazz = rootMirror.getClassByName(newTermName("test.ThrowsDeclaration_2"));
+  {
+  	val method = clazz.info.member(newTermName("foo"))
+  	val throwsAnn = method.annotations.head
+  	val atp = throwsAnn.atp
+  	println("foo")
+  	println("atp.typeParams.isEmpty: " + atp.typeParams.isEmpty)
+  	println(throwsAnn)
+  }
+  println
+
+  {
+  	val method = clazz.info.member(newTermName("bar"))
+  	val throwsAnn = method.annotations.head
+  	val Literal(const) = throwsAnn.args.head
+  	val tp = const.typeValue
+  	println("bar")
+  	println("tp.typeParams.isEmpty: " + tp.typeParams.isEmpty)
+  	println(throwsAnn)
+  }
+}
+"""
+}
diff --git a/test/files/jvm/throws-annot-from-java/ThrowsDeclaration_2.java b/test/files/jvm/throws-annot-from-java/ThrowsDeclaration_2.java
new file mode 100644
index 0000000000..3708fe626b
--- /dev/null
+++ b/test/files/jvm/throws-annot-from-java/ThrowsDeclaration_2.java
@@ -0,0 +1,6 @@
+package test;
+
+public class ThrowsDeclaration_2 {
+	public void foo() throws IllegalStateException {};
+	public void bar() throws PolymorphicException {};
+}