diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-05-18 14:50:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 14:50:31 +0000 |
| commit | 9e61c6eb220cf54b3fcac3d3fe7a7f1f59bcc7ad (patch) | |
| tree | eb502effa494d5446a8da49aca8ff8d54e49f9f1 /gcc/rust/backend/rust-compile-base.cc | |
| parent | 8cad07cfd2244ad9a40027a4306b81b4553a4797 (diff) | |
| parent | 4a4206c017654af7a3468690e4e21fdaf86bcb5c (diff) | |
| download | gcc-9e61c6eb220cf54b3fcac3d3fe7a7f1f59bcc7ad.zip gcc-9e61c6eb220cf54b3fcac3d3fe7a7f1f59bcc7ad.tar.gz gcc-9e61c6eb220cf54b3fcac3d3fe7a7f1f59bcc7ad.tar.bz2 | |
Merge #1250
1250: Support extern-blocks defined within blocks r=philberty a=philberty
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
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
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 |