gccrs: return error node when this fails during constexpr case

philberty · philberty · commit 6f1f7c726dba · 2025-07-18T16:11:39.000Z
Not adding the test case here we emit more errors than rustc for the error type node so its just noisy and dejagnu is being a pain. Fixes #3933 gcc/rust/ChangeLog: * backend/rust-compile-resolve-path.cc (ResolvePathRef::resolve): return error_mark_node Signed-off-by: Philip Herron <herron.philip@googlemail.com>
diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc
@@ -214,7 +214,8 @@ ResolvePathRef::resolve (const HIR::PathIdentSegment &final_segment,
 {
   TyTy::BaseType *lookup = nullptr;
   bool ok = ctx->get_tyctx ()->lookup_type (mappings.get_hirid (), &lookup);
-  rust_assert (ok);
+  if (!ok)
+    return error_mark_node;
 
   // need to look up the reference for this identifier
 

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,8 @@ ResolvePathRef::resolve (const HIR::PathIdentSegment &final_segment,`
`214`	`214`	`{`
`215`	`215`	`TyTy::BaseType *lookup = nullptr;`
`216`	`216`	`bool ok = ctx->get_tyctx ()->lookup_type (mappings.get_hirid (), &lookup);`
`217`		`- rust_assert (ok);`
	`217`	`+ if (!ok)`
	`218`	`+ return error_mark_node;`
`218`	`219`
`219`	`220`	`// need to look up the reference for this identifier`
`220`	`221`