Merge pull request #1123 from hzeller/add-detail-to-check-fail

Add more detail to a check failure seen in some Kythe indexings.
chipsalliance · Dec 13, 2021 · 380752c · 380752c
2 parents 35f00c1 + 6d96fb4
commit 380752c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/common/text/tree_utils.h b/common/text/tree_utils.h
@@ -204,8 +204,13 @@ const SyntaxTreeLeaf& GetSubtreeAsLeaf(const S& symbol,
                                        E parent_must_be_node_enum,
                                        size_t child_position) {
   internal::MustBeCSTSymbolOrNode(symbol);
-  return SymbolCastToLeaf(*ABSL_DIE_IF_NULL(
-      GetSubtreeAsSymbol(symbol, parent_must_be_node_enum, child_position)));
+  const Symbol* subtree =
+      GetSubtreeAsSymbol(symbol, parent_must_be_node_enum, child_position);
+  // TODO(ikr): avoid this check-failure.
+  CHECK(subtree != nullptr)
+      << symbol.Kind() << " e:" << parent_must_be_node_enum
+      << " p:" << child_position;
+  return SymbolCastToLeaf(*subtree);
 }
 
 template <class S, class E>