Merge pull request #2040 from scalamacros/ticket/7008

SI-7008 @throws annotations are now populated in reflect

1 files changed, 2 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 4b1d3c34f3..976f7e038b 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -1042,14 +1042,9 @@ abstract class ClassfileParser {
     def parseExceptions(len: Int) {
       val nClasses = in.nextChar
       for (n <- 0 until nClasses) {
+        // FIXME: this performs an equivalent of getExceptionTypes instead of getGenericExceptionTypes (SI-7065)
         val cls = pool.getClassSymbol(in.nextChar.toInt)
-        val tp = if (cls.isMonomorphicType) cls.tpe else {
-          debuglog(s"Encountered polymorphic exception `${cls.fullName}` while parsing class file.")
-          // in case we encounter polymorphic exception the best we can do is to convert that type to
-          // monomorphic one by introducing existientals, see SI-7009 for details
-          typer.packSymbols(cls.typeParams, cls.tpe)
-        }
-        sym.addAnnotation(appliedType(definitions.ThrowsClass, tp), Literal(Constant(tp)))
+        sym.addThrowsAnnotation(cls)
       }
     }