Test and handle similar shadowing formal case

Signed-off-by: Anna Rift <[email protected]>
chapel-lang · Sep 19, 2024 · 377ec06 · 377ec06
1 parent 0cfd280
commit 377ec06
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 28 deletions.
diff --git a/frontend/include/chpl/parsing/parsing-queries.h b/frontend/include/chpl/parsing/parsing-queries.h
@@ -507,11 +507,6 @@ bool idIsPrivateDecl(Context* context, ID id);
  */
 bool idIsFunction(Context* context, ID id);
 
-/**
- Returns true if the ID is a variable.
- */
-bool idIsVariable(Context* context, ID id);
-
 /**
  Returns true if the ID is marked 'extern'.
  */

diff --git a/frontend/lib/parsing/parsing-queries.cpp b/frontend/lib/parsing/parsing-queries.cpp
@@ -1315,11 +1315,6 @@ bool idIsFunction(Context* context, ID id) {
   return asttags::isFunction(tag);
 }
 
-bool idIsVariable(Context* context, ID id) {
-  AstTag tag = idToTag(context, id);
-  return asttags::isVariable(tag);
-}
-
 static bool
 checkLinkage(Context* context, ID id, uast::Decl::Linkage linkage) {
   if (id.isEmpty()) return false;

diff --git a/frontend/lib/resolution/Resolver.cpp b/frontend/lib/resolution/Resolver.cpp
@@ -3003,7 +3003,8 @@ void Resolver::resolveIdentifier(const Identifier* ident) {
   if (resolvingCalledIdent && ids.numIds() > 1) {
     bool onlyVars = true;
     for (auto idIt = ids.begin(); idIt != ids.end(); ++idIt) {
-      if (!parsing::idIsVariable(context, idIt.curIdAndFlags().id())) {
+      if (!parsing::idToAst(context, idIt.curIdAndFlags().id())
+               ->isVarLikeDecl()) {
         onlyVars = false;
         break;
       }

diff --git a/frontend/test/resolution/testMethodCalls.cpp b/frontend/test/resolution/testMethodCalls.cpp
@@ -767,29 +767,59 @@ static void test15() {
 }
 
 static void test16() {
-  // Test resolving 'this' call on automatic variable that shadows field
-  Context ctx;
-  Context* context = &ctx;
-  ErrorGuard guard(context);
+  // Test resolving 'this' call on variable that shadows field
 
-  std::string program = R"""(
-      class Foo {
-        var tup : 2*int;
+  {
+    // For automatic variable
+    Context ctx;
+    Context* context = &ctx;
+    ErrorGuard guard(context);
 
-        proc init() {}
+    std::string program = R"""(
+        class Foo {
+          var tup : 2*int;
 
-        proc doSomething() {
-          const tup = this.tup;
-          return tup(0);
+          proc init() {}
+
+          proc doSomething() {
+            const tup = this.tup;
+            return tup(0);
+          }
         }
-      }
 
-      var f = new Foo();
-      var x = f.doSomething();
-      )""";
+        var f = new Foo();
+        var x = f.doSomething();
+        )""";
 
-  auto vars = resolveTypesOfVariables(context, program, { "x" });
-  assert(guard.realizeErrors() == 0);
+    auto vars = resolveTypesOfVariables(context, program, { "x" });
+    assert(guard.realizeErrors() == 0);
+  }
+
+  {
+    // For formal
+    Context ctx;
+    Context* context = &ctx;
+    ErrorGuard guard(context);
+
+    std::string program = R"""(
+        class Foo {
+          var tup : 2*int;
+
+          proc init() {}
+
+          proc doSomething(tup) {
+            return tup(0);
+          }
+        }
+
+        var f = new Foo();
+        var anotherTup : 2*int;
+        var x = f.doSomething(anotherTup);
+        )""";
+
+    auto vars = resolveTypesOfVariables(context, program, { "x" });
+    assert(guard.realizeErrors() == 0);
+  }
 }
 
 int main() {