CARBON_FATAL/CARBON_CHECK for cases that are (for now) unreachable

carbon-language · Dec 17, 2024 · 9f5bb2c · 9f5bb2c
1 parent 55afe8d
commit 9f5bb2c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/toolchain/check/handle_name.cpp b/toolchain/check/handle_name.cpp
@@ -127,19 +127,17 @@ auto HandleParseNode(Context& context, Parse::IdentifierNameId node_id)
     -> bool {
   // The parent is responsible for binding the name.
   auto name_id = GetIdentifierAsName(context, node_id);
-  if (!name_id) {
-    return context.TODO(node_id, "Error recovery from keyword name.");
-  }
+  CARBON_CHECK(name_id,
+               "Unreachable until we support checking error parse nodes");
   context.node_stack().Push(node_id, *name_id);
   return true;
 }
 
 auto HandleParseNode(Context& context, Parse::IdentifierNameExprId node_id)
     -> bool {
   auto name_id = GetIdentifierAsName(context, node_id);
-  if (!name_id) {
-    return context.TODO(node_id, "Error recovery from keyword name.");
-  }
+  CARBON_CHECK(name_id,
+               "Unreachable until we support checking error parse nodes");
   context.node_stack().Push(node_id,
                             HandleNameAsExpr(context, node_id, *name_id));
   return true;

diff --git a/toolchain/check/handle_noop.cpp b/toolchain/check/handle_noop.cpp
@@ -13,18 +13,19 @@ auto HandleParseNode(Context& /*context*/, Parse::EmptyDeclId /*node_id*/)
   return true;
 }
 
-auto HandleParseNode(Context& context, Parse::InvalidParseId node_id) -> bool {
-  return context.TODO(node_id, "HandleInvalidParse");
+auto HandleParseNode(Context& /*context*/, Parse::InvalidParseId /*node_id*/)
+    -> bool {
+  CARBON_FATAL("Unreachable until we support checking error parse nodes");
 }
 
-auto HandleParseNode(Context& context, Parse::InvalidParseStartId node_id)
-    -> bool {
-  return context.TODO(node_id, "HandleInvalidParseStart");
+auto HandleParseNode(Context& /*context*/,
+                     Parse::InvalidParseStartId /*node_id*/) -> bool {
+  CARBON_FATAL("Unreachable until we support checking error parse nodes");
 }
 
-auto HandleParseNode(Context& context, Parse::InvalidParseSubtreeId node_id)
-    -> bool {
-  return context.TODO(node_id, "HandleInvalidParseSubtree");
+auto HandleParseNode(Context& /*context*/,
+                     Parse::InvalidParseSubtreeId /*node_id*/) -> bool {
+  CARBON_FATAL("Unreachable until we support checking error parse nodes");
 }
 
 auto HandleParseNode(Context& /*context*/, Parse::PlaceholderId /*node_id*/)