aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/backend/rust-compile-context.h
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-04-08 08:30:30 +0000
committerGitHub <noreply@github.com>2022-04-08 08:30:30 +0000
commitda3d59db1f13fb08aa9bd394b36379068315477c (patch)
tree96e6621e8cb28606efa91c030d2b9de4c77339f6 /gcc/rust/backend/rust-compile-context.h
parentb829e7c0a21c94672d09732e4a791e0471f41c13 (diff)
parent5559bdc86635b2ff6cbaa60e933a7989ff212e1f (diff)
downloadgcc-da3d59db1f13fb08aa9bd394b36379068315477c.zip
gcc-da3d59db1f13fb08aa9bd394b36379068315477c.tar.gz
gcc-da3d59db1f13fb08aa9bd394b36379068315477c.tar.bz2
Merge #1087
1087: Use loop to initialize repeat arrays r=philberty a=dafaust This PR changes how we compile initializers for arrays of repeating elements. I use the same approach outlined in the comments of the linked issue, with some tweaks. It is very similar to how the D language front-end compiles, the new function `Gcc_backend::array_initializer` is heavily inspired by the D front-end's `build_array_set` This fixes the issue where the compiler tries to allocate a vec containing all elements of the array to be constructed, and therefore explodes on huge constructions (e.g. `let x = [0u8; 4 * 1024 * 1024 * 1024 * 1024]`) However, we can only initialize non-const arrays in this way. For arrays in const contexts we must initialize them at compile time, and therefore continue using the old method. Fixes: #1068 Co-authored-by: David Faust <david.faust@oracle.com>
Diffstat (limited to 'gcc/rust/backend/rust-compile-context.h')
-rw-r--r--gcc/rust/backend/rust-compile-context.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/gcc/rust/backend/rust-compile-context.h b/gcc/rust/backend/rust-compile-context.h
index 4bade5c..de9d03f 100644
--- a/gcc/rust/backend/rust-compile-context.h
+++ b/gcc/rust/backend/rust-compile-context.h
@@ -250,6 +250,10 @@ public:
fn_stack.push_back (fncontext{fn, ret_addr});
}
void pop_fn () { fn_stack.pop_back (); }
+
+ bool in_fn () { return fn_stack.size () != 0; }
+
+ // Note: it is undefined behavior to call peek_fn () if fn_stack is empty.
fncontext peek_fn () { return fn_stack.back (); }
void push_type (tree t) { type_decls.push_back (t); }
@@ -301,6 +305,14 @@ public:
return pop;
}
+ void push_const_context (void) { const_context++; }
+ void pop_const_context (void)
+ {
+ if (const_context > 0)
+ const_context--;
+ }
+ bool const_context_p (void) { return (const_context > 0); }
+
std::string mangle_item (const TyTy::BaseType *ty,
const Resolver::CanonicalPath &path) const
{
@@ -341,6 +353,9 @@ private:
std::vector<::Bvariable *> var_decls;
std::vector<tree> const_decls;
std::vector<tree> func_decls;
+
+ // Nonzero iff we are currently compiling something inside a constant context.
+ unsigned int const_context = 0;
};
} // namespace Compile