Fix for a crash caused by choice alternative name being the same as c…

…hoice name (#1243) Fixes #1248 Changed resolve names logic to add choice name to name resolution after choice's alternatives are added.
carbon-language · May 11, 2022 · e06d67a · e06d67a
1 parent 8c28000
commit e06d67a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/explorer/fuzzing/fuzzer_corpus/dedba2ac81916ee306624a2ac3db2a3c7a4ea5ad.textproto b/explorer/fuzzing/fuzzer_corpus/dedba2ac81916ee306624a2ac3db2a3c7a4ea5ad.textproto
@@ -0,0 +1,26 @@
+compilation_unit {
+  declarations {
+    choice {
+      alternatives {
+        signature {
+          primitive_operator {
+            arguments {
+              intrinsic {
+                argument {
+                  fields {
+                    primitive_operator {
+                      arguments {
+                        identifier {
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/explorer/interpreter/resolve_names.cpp b/explorer/interpreter/resolve_names.cpp
@@ -47,8 +47,8 @@ static auto AddExposedNames(const Declaration& declaration,
       break;
     }
     case DeclarationKind::ChoiceDeclaration: {
-      auto& choice = cast<ChoiceDeclaration>(declaration);
-      CARBON_RETURN_IF_ERROR(enclosing_scope.Add(choice.name(), &choice));
+      // Choice name is added to the scope after the choice's alternatives.
+      // See https://github.com/carbon-language/carbon-lang/issues/1248.
       break;
     }
     case DeclarationKind::VariableDeclaration: {
@@ -424,6 +424,7 @@ static auto ResolveNames(Declaration& declaration, StaticScope& enclosing_scope)
                  << "` in choice type";
         }
       }
+      CARBON_RETURN_IF_ERROR(enclosing_scope.Add(choice.name(), &choice));
       break;
     }
     case DeclarationKind::VariableDeclaration: {