diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-04 22:06:54 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-02-04 22:06:54 +0100 |
| commit | 0bcdf71a96d6d0b6276801efbe49081f0ae7749d (patch) | |
| tree | a02514796f975e9a9fc5a022c2e1da9f457b9ba4 /src/reflect/scala/reflect | |
| parent | adf50a3ac0c6861a77a781abc0814c5d17927175 (diff) | |
| download | scala-0bcdf71a96d6d0b6276801efbe49081f0ae7749d.tar.gz scala-0bcdf71a96d6d0b6276801efbe49081f0ae7749d.tar.bz2 scala-0bcdf71a96d6d0b6276801efbe49081f0ae7749d.zip | |
pullrequest feedback
https://github.com/scala/scala/pull/2040
Diffstat (limited to 'src/reflect/scala/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/AnnotationInfos.scala | 10 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala index 29879f9806..032b45316e 100644 --- a/src/reflect/scala/reflect/internal/AnnotationInfos.scala +++ b/src/reflect/scala/reflect/internal/AnnotationInfos.scala @@ -33,14 +33,14 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable => case ThrownException(exc) => exc } - def addThrowsAnnotation(excSym: Symbol): Self = { - val excTpe = if (excSym.isMonomorphicType) excSym.tpe else { - debuglog(s"Encountered polymorphic exception `${excSym.fullName}` while parsing class file.") + def addThrowsAnnotation(throwableSym: Symbol): Self = { + val throwableTpe = if (throwableSym.isMonomorphicType) throwableSym.tpe else { + debuglog(s"Encountered polymorphic exception `${throwableSym.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 existentials, see SI-7009 for details - existentialAbstraction(excSym.typeParams, excSym.tpe) + existentialAbstraction(throwableSym.typeParams, throwableSym.tpe) } - val throwsAnn = AnnotationInfo(appliedType(definitions.ThrowsClass, excTpe), List(Literal(Constant(excTpe))), Nil) + val throwsAnn = AnnotationInfo(appliedType(definitions.ThrowsClass, throwableTpe), List(Literal(Constant(throwableTpe))), Nil) withAnnotations(List(throwsAnn)) } diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index 698b60b929..ea2fc4afe9 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -616,7 +616,7 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni */ private def copyAnnotations(sym: Symbol, jann: AnnotatedElement) { sym setAnnotations (jann.getAnnotations map JavaAnnotationProxy).toList - // FIXME: we're not using getGenericExceptionTypes here to be consistent with ClassfileParser + // SI-7065: we're not using getGenericExceptionTypes here to be consistent with ClassfileParser val jexTpes = jann match { case jm: jMethod => jm.getExceptionTypes.toList case jconstr: jConstructor[_] => jconstr.getExceptionTypes.toList |