Merge pull request #4092 from dotty-staging/remove-dead-code-4

Remove dead code in CapturedVars

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/CapturedVars.scala

@@ -111,10 +111,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase =
       def boxMethod(name: TermName): Tree =
         ref(vble.info.classSymbol.companionModule.info.member(name).symbol)
       cpy.ValDef(vdef)(
-        rhs = vdef.rhs match {
-          case EmptyTree => boxMethod(nme.zero).appliedToNone.withPos(vdef.pos)
-          case arg => boxMethod(nme.create).appliedTo(arg)
-        },
+        rhs = boxMethod(nme.create).appliedTo(vdef.rhs),
         tpt = TypeTree(vble.info).withPos(vdef.tpt.pos))
     } else vdef
   }

tests/pos/capturedVars2.scala

@@ -0,0 +1,14 @@
+abstract class Test {
+
+  var field: Int
+  val field2: Int
+
+  def foo() = {
+
+    var x: Int = 1
+
+    def inner() = {
+      x = x + 1 + field + field2
+    }
+  }
+}