diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-09-22 12:20:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-22 12:20:49 +0000 |
| commit | 6da3cab7b0acf5dc363c85069bef716923ddf90c (patch) | |
| tree | 4f78124e43846c0dfb272858ed60cc681236a140 /gcc/rust/backend | |
| parent | f252b4093666cf1e3d948b22f00fc12bf283a83f (diff) | |
| parent | 5f01d6c53734802955568771e75df68ffc2fd0d8 (diff) | |
| download | gcc-6da3cab7b0acf5dc363c85069bef716923ddf90c.zip gcc-6da3cab7b0acf5dc363c85069bef716923ddf90c.tar.gz gcc-6da3cab7b0acf5dc363c85069bef716923ddf90c.tar.bz2 | |
Merge #1541
1541: Static const eval safety r=philberty a=philberty
This adds a test case for the rust issue: https://blog.rust-lang.org/2022/09/15/const-eval-safety-rule-revision.html
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
Diffstat (limited to 'gcc/rust/backend')
| -rw-r--r-- | gcc/rust/backend/rust-compile-item.cc | 7 | ||||
| -rw-r--r-- | gcc/rust/backend/rust-tree.cc | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/rust/backend/rust-compile-item.cc b/gcc/rust/backend/rust-compile-item.cc index 96c4e7f..8ba17c9 100644 --- a/gcc/rust/backend/rust-compile-item.cc +++ b/gcc/rust/backend/rust-compile-item.cc @@ -43,13 +43,18 @@ CompileItem::visit (HIR::StaticItem &var) rust_assert (ok); tree type = TyTyResolveCompile::compile (ctx, resolved_type); - tree value = CompileExpr::Compile (var.get_expr (), ctx); const Resolver::CanonicalPath *canonical_path = nullptr; ok = ctx->get_mappings ()->lookup_canonical_path ( var.get_mappings ().get_nodeid (), &canonical_path); rust_assert (ok); + HIR::Expr *const_value_expr = var.get_expr (); + ctx->push_const_context (); + tree value = compile_constant_item (ctx, resolved_type, canonical_path, + const_value_expr, var.get_locus ()); + ctx->pop_const_context (); + std::string name = canonical_path->get (); std::string asm_name = ctx->mangle_item (resolved_type, *canonical_path); diff --git a/gcc/rust/backend/rust-tree.cc b/gcc/rust/backend/rust-tree.cc index f587835..0c393d9 100644 --- a/gcc/rust/backend/rust-tree.cc +++ b/gcc/rust/backend/rust-tree.cc @@ -974,9 +974,10 @@ rs_type_quals (const_tree type) return TYPE_UNQUALIFIED; quals = TYPE_QUALS (type); /* METHOD and REFERENCE_TYPEs should never have quals. */ - gcc_assert ( - (TREE_CODE (type) != METHOD_TYPE && !TYPE_REF_P (type)) - || ((quals & (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE)) == TYPE_UNQUALIFIED)); + // gcc_assert ( + // (TREE_CODE (type) != METHOD_TYPE && !TYPE_REF_P (type)) + // || ((quals & (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE)) == + // TYPE_UNQUALIFIED)); return quals; } |