diff options
author | Philip Herron <philip.herron@embecosm.com> | 2022-01-13 22:01:59 +0000 |
---|---|---|
committer | Philip Herron <philip.herron@embecosm.com> | 2022-01-14 12:32:40 +0000 |
commit | 52780af6602763fac6297f7983878b38e0188bb9 (patch) | |
tree | 41a8d89d018f527b3f20159da1279f67aac71f40 /gcc/rust/backend/rust-compile-resolve-path.cc | |
parent | 06c2a74f557ec98896c9f71ba666bd969c4735d2 (diff) | |
download | gcc-52780af6602763fac6297f7983878b38e0188bb9.zip gcc-52780af6602763fac6297f7983878b38e0188bb9.tar.gz gcc-52780af6602763fac6297f7983878b38e0188bb9.tar.bz2 |
Redesign constant folding from the typechecking pass to the backend
In Rust the ArrayType has a constant capacity constraint, this means it
allows for bounds checking at compile time as no variable length arrays are
allowed. In order to typecheck this case we had a constant folding pass as
part of the typechecking system which generated gcc tree's for the IR
and enforced the constant checking along the way.
Also after doing some testing GCC with optimizations turned on is capable
of constant folding/propogating the compilation unit fully. Which meant we
need a method of doing with regardless of optimization level to be able
to be on par with what the Rust language expects we need a full proof
method. Turns out the CPP front-end already does this via its constexpr
mechanism to ensure that these _do_ fold correclty. Another major reason
to do this change is that the original const fold pass was a striped down
copy of what the backend is _already_ doing which is creating a duplication
of the code generation pass. With this all unified into the code generation
pass all we need to do is port over gcc/cp/constexpr.c to enforce the const
rules fully but at the GCC tree level not at the typed HIR level.
Now that we have unified the pass when we hit a const function we can
simply emit a normal GCC function and outside of const expressions GCC
will simply emit a normal CallExpr and depending on optimization level
fully optimize this. If we are in a ConstDecl we will follow the
rust-constexpr.cc and fold the values or error_mark_node with an apropriate
error. By reusing the CPP constexpr code we _know_ it works so reusing it
as much as possible is a good idea in general for this front-end.
Addresses #799
Diffstat (limited to 'gcc/rust/backend/rust-compile-resolve-path.cc')
-rw-r--r-- | gcc/rust/backend/rust-compile-resolve-path.cc | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc index 07133b9..c1d0778 100644 --- a/gcc/rust/backend/rust-compile-resolve-path.cc +++ b/gcc/rust/backend/rust-compile-resolve-path.cc @@ -95,11 +95,24 @@ ResolvePathRef::resolve (const HIR::PathIdentSegment &final_segment, tree compiled_adt_type = TyTyResolveCompile::compile (ctx, adt); // make the ctor for the union - mpz_t val; - mpz_init_set_ui (val, variant->get_discriminant ()); - tree t = TyTyResolveCompile::get_implicit_enumeral_node_type (ctx); - tree qualifier - = double_int_to_tree (t, mpz_get_double_int (t, val, true)); + tree qualifier = error_mark_node; + if (variant->is_specified_discriminant_node ()) + { + auto discrim_node = variant->get_discriminant_node (); + auto &discrim_expr = discrim_node->get_discriminant_expression (); + + tree discrim_expr_node + = CompileExpr::Compile (discrim_expr.get (), ctx); + tree folded_discrim_expr = ConstCtx::fold (discrim_expr_node); + qualifier = folded_discrim_expr; + } + else + { + mpz_t val; + mpz_init_set_ui (val, variant->get_discriminant ()); + tree t = TyTyResolveCompile::get_implicit_enumeral_node_type (ctx); + qualifier = double_int_to_tree (t, mpz_get_double_int (t, val, true)); + } return ctx->get_backend ()->constructor_expression (compiled_adt_type, true, {qualifier}, |