diff options
| author | SimplyTheOther <simplytheother@gmail.com> | 2021-01-11 16:33:01 +0800 |
|---|---|---|
| committer | SimplyTheOther <simplytheother@gmail.com> | 2021-01-11 16:33:01 +0800 |
| commit | bc94b7de4614100b63e17a50692a23feab1c139f (patch) | |
| tree | 697d3614ebc838d15875eb6602bd349ca885403c /gcc/rust/backend | |
| parent | aa487ef2717e0f319f2f8d3496d0003939ec2b09 (diff) | |
| parent | 9a3ad294e0af5ed45b53c340382a7806fb150bdf (diff) | |
| download | gcc-bc94b7de4614100b63e17a50692a23feab1c139f.zip gcc-bc94b7de4614100b63e17a50692a23feab1c139f.tar.gz gcc-bc94b7de4614100b63e17a50692a23feab1c139f.tar.bz2 | |
Merge branch 'master' of https://github.com/redbrain/gccrs
Diffstat (limited to 'gcc/rust/backend')
| -rw-r--r-- | gcc/rust/backend/rust-compile-item.h | 2 | ||||
| -rw-r--r-- | gcc/rust/backend/rust-compile-resolve-path.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/backend/rust-compile.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/rust/backend/rust-compile-item.h b/gcc/rust/backend/rust-compile-item.h index f1b39da..e042ccb 100644 --- a/gcc/rust/backend/rust-compile-item.h +++ b/gcc/rust/backend/rust-compile-item.h @@ -180,7 +180,7 @@ public: } std::vector<Bvariable *> locals; - rib->iterate_decls ([&] (NodeId n) mutable -> bool { + rib->iterate_decls ([&] (NodeId n, Location) mutable -> bool { Resolver::Definition d; bool ok = ctx->get_resolver ()->lookup_definition (n, &d); rust_assert (ok); diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc index c24005e..374f8a0 100644 --- a/gcc/rust/backend/rust-compile-resolve-path.cc +++ b/gcc/rust/backend/rust-compile-resolve-path.cc @@ -75,7 +75,7 @@ ResolvePathType::visit (HIR::PathInExpression &expr) { // need to look up the reference for this identifier NodeId ref_node_id; - if (!ctx->get_resolver ()->lookup_resolved_name ( + if (!ctx->get_resolver ()->lookup_resolved_type ( expr.get_mappings ().get_nodeid (), &ref_node_id)) { rust_fatal_error (expr.get_locus (), "failed to look up resolved name"); diff --git a/gcc/rust/backend/rust-compile.cc b/gcc/rust/backend/rust-compile.cc index a52f183..3f8a962 100644 --- a/gcc/rust/backend/rust-compile.cc +++ b/gcc/rust/backend/rust-compile.cc @@ -64,7 +64,7 @@ CompileBlock::visit (HIR::BlockExpr &expr) } std::vector<Bvariable *> locals; - rib->iterate_decls ([&] (NodeId n) mutable -> bool { + rib->iterate_decls ([&] (NodeId n, Location) mutable -> bool { Resolver::Definition d; bool ok = ctx->get_resolver ()->lookup_definition (n, &d); rust_assert (ok); |