Skip label methods in enclosing method

Otherwise would spuriously treat variables referenced
from while loops as captured, because their enclosing method
differs from current enclosing method.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala
index 049c8185f..c9777ebf6 100644
--- a/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -666,7 +666,7 @@ object SymDenotations {
      *  A local dummy owner is mapped to the primary constructor of the class.
      */
     final def enclosingMethod(implicit ctx: Context): Symbol =
-      if (this is Method) symbol
+      if (this is (Method, butNot = Label)) symbol
       else if (this.isClass) primaryConstructor
       else owner.enclosingMethod
 
@@ -1320,6 +1320,8 @@ object SymDenotations {
             baseTypeRefOf(tp1) & baseTypeRefOf(tp2)
           case OrType(tp1, tp2) =>
             baseTypeRefOf(tp1) | baseTypeRefOf(tp2)
+          case JavaArrayType(_) if symbol == defn.ObjectClass =>
+            this.typeRef
           case _ =>
             NoType
         }