diff options
| author | Philip Herron <philip.herron@embecosm.com> | 2022-05-16 17:09:45 +0100 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2022-05-17 11:18:31 +0100 |
| commit | 4a4206c017654af7a3468690e4e21fdaf86bcb5c (patch) | |
| tree | 4ddbcbcb3a61bc12b5025c9bf1ea8316cdb5b083 /gcc/rust/backend/rust-compile-base.cc | |
| parent | e4213b9568ae8cb8a4e31326e0e78c79db0a99cc (diff) | |
| download | gcc-4a4206c017654af7a3468690e4e21fdaf86bcb5c.zip gcc-4a4206c017654af7a3468690e4e21fdaf86bcb5c.tar.gz gcc-4a4206c017654af7a3468690e4e21fdaf86bcb5c.tar.bz2 | |
Support extern-blocks defined within blocks
This adds support for declaring extern blocks within blocks. So this adds
the missing name resolution visitor for the statement context. Then we
extract out a common extern block hir lowering function for both contexts.
The type resolution step needs to be updated to be like the code-generation
step so that we can solve these paths in a query rather than a top down
approach but this is a known issue.
The final step was to support query based compilation to extern functions.
Fixes #976
Diffstat (limited to 'gcc/rust/backend/rust-compile-base.cc')
| -rw-r--r-- | gcc/rust/backend/rust-compile-base.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc index 6773ac6..7b0a375 100644 --- a/gcc/rust/backend/rust-compile-base.cc +++ b/gcc/rust/backend/rust-compile-base.cc @@ -343,8 +343,12 @@ HIRCompileBase::compile_locals_for_block (Context *ctx, Resolver::Rib &rib, rust_assert (ok); HIR::Stmt *decl = nullptr; - ok = ctx->get_mappings ()->resolve_nodeid_to_stmt (d.parent, &decl); - rust_assert (ok); + if (!ctx->get_mappings ()->resolve_nodeid_to_stmt (d.parent, &decl)) + { + // might be an extern block see fix for + // https://github.com/Rust-GCC/gccrs/issues/976 + continue; + } // if its a function we extract this out side of this fn context // and it is not a local to this function |