summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-19 00:53:07 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-19 00:53:07 -0700
commitd9b65592df28e8c9655b52c0265f499d757617ba (patch)
tree95b5fe0b226cccae10ea9cd0c6f54baf922aa14e /src/reflect
parent92716b54847418565526dc6ec57c6521d1c0c807 (diff)
parent01be1b1c201d6908522d7254075fd1cdf633809a (diff)
downloadscala-d9b65592df28e8c9655b52c0265f499d757617ba.tar.gz
scala-d9b65592df28e8c9655b52c0265f499d757617ba.tar.bz2
scala-d9b65592df28e8c9655b52c0265f499d757617ba.zip
Merge pull request #922 from dragos/issue/fix-SI-6092
SI-6092 don't leak in LazyAnnotationInfo, don't lift try{}finally{}
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/AnnotationInfos.scala7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
index c283ae408e..2bcc95b9a8 100644
--- a/src/reflect/scala/reflect/internal/AnnotationInfos.scala
+++ b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
@@ -160,12 +160,7 @@ trait AnnotationInfos extends api.AnnotationInfos { self: SymbolTable =>
*/
final class LazyAnnotationInfo(lazyInfo: => AnnotationInfo) extends AnnotationInfo {
private var forced = false
- private lazy val forcedInfo =
- try {
- val result = lazyInfo
- if (result.pos == NoPosition) result setPos pos
- result
- } finally forced = true
+ private lazy val forcedInfo = try lazyInfo finally forced = true
def atp: Type = forcedInfo.atp
def args: List[Tree] = forcedInfo.args