Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions gcc/rust/backend/rust-compile-resolve-path.cc
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,18 @@ ResolvePathRef::resolve_with_node_id (
}

// Handle unit struct
tree resolved_item = error_mark_node;
if (lookup->get_kind () == TyTy::TypeKind::ADT)
return attempt_constructor_expression_lookup (lookup, ctx, mappings,
expr_locus);
resolved_item
= attempt_constructor_expression_lookup (lookup, ctx, mappings,
expr_locus);

if (!error_operand_p (resolved_item))
return resolved_item;

// let the query system figure it out
tree resolved_item = query_compile (ref, lookup, final_segment, mappings,
expr_locus, is_qualified_path);
resolved_item = query_compile (ref, lookup, final_segment, mappings,
expr_locus, is_qualified_path);
if (resolved_item != error_mark_node)
{
TREE_USED (resolved_item) = 1;
Expand Down
6 changes: 6 additions & 0 deletions gcc/testsuite/rust/compile/issue-3525.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// { dg-options "-w" }

struct Foo(usize);

const B: usize = A.0;
const A: Foo = Foo(123);