aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/resolve/rust-ast-resolve-expr.h
diff options
context:
space:
mode:
authorPhilip Herron <philip.herron@embecosm.com>2021-01-08 17:18:00 +0000
committerPhilip Herron <herron.philip@googlemail.com>2021-01-10 15:59:22 +0000
commit9a3ad294e0af5ed45b53c340382a7806fb150bdf (patch)
tree81458d62a2191b38be775026f2f8583d3ca7c2ee /gcc/rust/resolve/rust-ast-resolve-expr.h
parent0f42a240e53e932de0ae4799d54fe0bd15d06047 (diff)
downloadgcc-9a3ad294e0af5ed45b53c340382a7806fb150bdf.zip
gcc-9a3ad294e0af5ed45b53c340382a7806fb150bdf.tar.gz
gcc-9a3ad294e0af5ed45b53c340382a7806fb150bdf.tar.bz2
Add in a check for unused decls within ribs.
This lead to cleanup of the name resolver as the usage of mappings means that in a given rib if there are no references to a decl NodeId that means it was not used. To get on par with the offical rust compiler it should be allowed to have a reference where the name was assigned but not used but this might be a seperate pass.
Diffstat (limited to 'gcc/rust/resolve/rust-ast-resolve-expr.h')
-rw-r--r--gcc/rust/resolve/rust-ast-resolve-expr.h30
1 files changed, 18 insertions, 12 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h
index 2292d16..324d820 100644
--- a/gcc/rust/resolve/rust-ast-resolve-expr.h
+++ b/gcc/rust/resolve/rust-ast-resolve-expr.h
@@ -40,21 +40,27 @@ public:
void visit (AST::PathInExpression &expr)
{
// name scope first
- if (!resolver->get_name_scope ().lookup (expr.as_string (), &resolved_node))
+ if (resolver->get_name_scope ().lookup (expr.as_string (), &resolved_node))
{
- // check the type scope
- if (!resolver->get_type_scope ().lookup (expr.as_string (),
+ resolver->insert_resolved_name (expr.get_node_id (), resolved_node);
+ resolver->insert_new_definition (expr.get_node_id (),
+ Definition{expr.get_node_id (),
+ parent});
+ }
+ // check the type scope
+ else if (resolver->get_type_scope ().lookup (expr.as_string (),
&resolved_node))
- {
- rust_error_at (expr.get_locus (), "unknown path %s",
- expr.as_string ().c_str ());
- return;
- }
+ {
+ resolver->insert_resolved_type (expr.get_node_id (), resolved_node);
+ resolver->insert_new_definition (expr.get_node_id (),
+ Definition{expr.get_node_id (),
+ parent});
+ }
+ else
+ {
+ rust_error_at (expr.get_locus (), "unknown path %s",
+ expr.as_string ().c_str ());
}
-
- resolver->insert_resolved_name (expr.get_node_id (), resolved_node);
- resolver->insert_new_definition (expr.get_node_id (),
- Definition{expr.get_node_id (), parent});
}
void visit (AST::ReturnExpr &expr)