Dyno fix forwarding with except excluding other symbols

frontend/lib/resolution/resolution-queries.cpp

@@ -636,7 +636,12 @@ static void helpSetFieldTypes(const CompositeType* ct,
       if (fwdTo->isDecl()) {
         helpSetFieldTypes(ct, fwd->expr(), r, initedInParent, fields, syntaxOnly);
       }
-      fields.addForwarding(fwd->id(), r.byAst(fwdTo).type());
+      // If it's a visibility clause, use the type of the symbol rather than
+      // the whole clause.
+      auto fwdToSymbol = fwdTo->isVisibilityClause()
+                             ? fwdTo->toVisibilityClause()->symbol()
+                             : fwdTo;
+      fields.addForwarding(fwd->id(), r.byAst(fwdToSymbol).type());
     }
   }
 

frontend/test/resolution/testForwarding.cpp

@@ -495,6 +495,44 @@ static void test7() {
   guard.realizeErrors();
 }
 
+// Test that 'except' clause doesn't exclude other symbols.
+// Doesn't test 'except' correct exclusion functionality.
+static void test8() {
+  printf("test8\n");
+
+  Context ctx;
+  Context* context = &ctx;
+  ErrorGuard guard(context);
+
+  const char* contents =
+    R""""(
+    module M {
+      record Foo {
+        var _instance : owned Bar;
+
+        proc init(value) {
+          this._instance = value;
+        }
+
+        proc arbitrarySymbol do return 4;
+        forwarding _instance except arbitrarySymbol;
+      }
+
+      class Bar {
+        var asdf : int;
+      }
+
+      var myFoo = new Foo(new unmanaged Bar());
+      var x = myFoo.asdf;
+    }
+    )"""";
+
+  auto qt = resolveQualifiedTypeOfX(context, contents);
+  assert(qt.type()->isIntType());
+
+  guard.realizeErrors();
+}
+
 
 int main() {
   test1();
@@ -513,6 +551,8 @@ int main() {
 
   // TODO: forwarding with only, except
 
+  test8();
+
   return 0;
 }