From b25b37e9148bec1fc65e0749ea57ed9730a9abec Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Fri, 24 Aug 2012 08:33:11 +0200
Subject: SI-6272 Support lazy vals defined in try in template.

---
 .../scala/tools/nsc/transform/LazyVals.scala       |  2 +-
 test/files/run/t6272.check                         | 10 ++++
 test/files/run/t6272.scala                         | 62 ++++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 test/files/run/t6272.check
 create mode 100644 test/files/run/t6272.scala

diff --git a/src/compiler/scala/tools/nsc/transform/LazyVals.scala b/src/compiler/scala/tools/nsc/transform/LazyVals.scala
index e8387c80f5..12e2433e0d 100644
--- a/src/compiler/scala/tools/nsc/transform/LazyVals.scala
+++ b/src/compiler/scala/tools/nsc/transform/LazyVals.scala
@@ -111,7 +111,7 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD
           var added = false
           val stats =
             for (stat <- body1) yield stat match {
-              case Block(_, _) | Apply(_, _) | If(_, _, _) if !added =>
+              case Block(_, _) | Apply(_, _) | If(_, _, _) | Try(_, _, _) if !added =>
                 // Avoid adding bitmaps when they are fully overshadowed by those
                 // that are added inside loops
                 if (LocalLazyValFinder.find(stat)) {
diff --git a/test/files/run/t6272.check b/test/files/run/t6272.check
new file mode 100644
index 0000000000..f00c965d83
--- /dev/null
+++ b/test/files/run/t6272.check
@@ -0,0 +1,10 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
diff --git a/test/files/run/t6272.scala b/test/files/run/t6272.scala
new file mode 100644
index 0000000000..174436919b
--- /dev/null
+++ b/test/files/run/t6272.scala
@@ -0,0 +1,62 @@
+// x1, x2, and x3 resulted in: symbol variable bitmap$0 does not exist in A.<init>
+object A {
+
+  try {
+    lazy val x1 = 1
+    println(x1)
+    sys.error("!")
+  } catch {
+    case _: Throwable =>
+      lazy val x2 = 2
+      println(x2)
+  } finally {
+    lazy val x3 = 3
+    println(x3)
+  }
+
+  if ("".isEmpty) {
+    lazy val x4 = 4
+    println(x4)
+  }
+
+  var b = true
+  while(b) {
+    lazy val x5 = 5
+    println(x5)
+    b = false
+  }
+
+
+  def method {
+    try {
+      lazy val x6 = 6
+      println(x6)
+      sys.error("!")
+    } catch {
+      case _: Throwable =>
+        lazy val x7 = 7
+        println(x7)
+    } finally {
+      lazy val x8 = 8
+      println(x8)
+    }
+
+    if ("".isEmpty) {
+      lazy val x9 = 9
+      println(x9)
+    }
+
+    var b = true
+    while(b) {
+      lazy val x10 = 10
+      println(x10)
+      b = false
+    }
+  }
+}
+
+object Test {
+  def main(args: Array[String]) {
+    A.method
+  }
+}
-- 
cgit v1.2.3