From: Arthur Cohen <arthur.co...@embecosm.com>
This commit turns a few of the fields into `tl::optional<T>` and cleanups
the constructor with a couple default parameters. We can also reuse the
variable that we are `switch`ing on, instead of repeating the enum variants
each time.
Most importantly, the `FeatureGate` visitor now uses the `DefaultAstVisitor`
correctly, and will now visit nested items. This means that we have to
fix a bunch of the testsuite as some feature attributes were missing.
gcc/rust/ChangeLog:
* checks/errors/rust-feature.cc (Feature::create): Reuse variable,
remove now optional parameters from constructor.
* checks/errors/rust-feature.h: Cleanup class definition.
* checks/errors/rust-feature-gate.cc (FeatureGate::gate): Use optional.
* checks/errors/rust-feature-gate.h: Cleanup visitor implementation.
gcc/testsuite/ChangeLog:
* rust/compile/assume.rs: Add missing feature attribute.
* rust/compile/issue-1901.rs: Likewise.
* rust/compile/issue-1981.rs: Likewise.
* rust/compile/sizeof-stray-infer-var-bug.rs: Likewise.
* rust/compile/torture/intrinsics-8.rs: Likewise.
* rust/compile/torture/transmute-size-check-1.rs: Likewise.
* rust/compile/torture/transmute1.rs: Likewise.
* rust/compile/torture/uninit-intrinsic-1.rs: Likewise.
* rust/execute/torture/issue-1436.rs: Likewise.
* rust/execute/torture/issue-2583.rs: Likewise.
---
.../errors/borrowck/ffi-polonius/Cargo.lock | 39 +++++
gcc/rust/checks/errors/rust-feature-gate.cc | 10 +-
gcc/rust/checks/errors/rust-feature-gate.h | 136 ------------------
gcc/rust/checks/errors/rust-feature.cc | 40 +++---
gcc/rust/checks/errors/rust-feature.h | 13 +-
gcc/testsuite/rust/compile/assume.rs | 2 +
gcc/testsuite/rust/compile/issue-1901.rs | 2 +
gcc/testsuite/rust/compile/issue-1981.rs | 2 +
.../compile/sizeof-stray-infer-var-bug.rs | 2 +
.../rust/compile/torture/intrinsics-8.rs | 2 +
.../compile/torture/transmute-size-check-1.rs | 2 +
.../rust/compile/torture/transmute1.rs | 2 +
.../compile/torture/uninit-intrinsic-1.rs | 2 +
.../rust/execute/torture/issue-1436.rs | 3 +
.../rust/execute/torture/issue-2583.rs | 2 +
15 files changed, 90 insertions(+), 169 deletions(-)
create mode 100644 gcc/rust/checks/errors/borrowck/ffi-polonius/Cargo.lock
diff --git a/gcc/rust/checks/errors/borrowck/ffi-polonius/Cargo.lock
b/gcc/rust/checks/errors/borrowck/ffi-polonius/Cargo.lock
new file mode 100644
index 00000000000..f7cbd414caf
--- /dev/null
+++ b/gcc/rust/checks/errors/borrowck/ffi-polonius/Cargo.lock
@@ -0,0 +1,39 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "datafrog"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a0afaad2b26fa326569eb264b1363e8ae3357618c43982b3f285f0774ce76b69"
+
+[[package]]
+name = "ffi-polonius"
+version = "0.1.0"
+dependencies = [
+ "polonius-engine",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "polonius-engine"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c4e8e505342045d397d0b6674dcb82d6faf5cf40484d30eeb88fc82ef14e903f"
+dependencies = [
+ "datafrog",
+ "log",
+ "rustc-hash",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
diff --git a/gcc/rust/checks/errors/rust-feature-gate.cc
b/gcc/rust/checks/errors/rust-feature-gate.cc
index ca19374b4f3..4ab614e8853 100644
--- a/gcc/rust/checks/errors/rust-feature-gate.cc
+++ b/gcc/rust/checks/errors/rust-feature-gate.cc
@@ -21,6 +21,7 @@
#include "rust-attribute-values.h"
#include "rust-ast-visitor.h"
#include "rust-feature.h"
+#include "rust-ast-full.h"
namespace Rust {
@@ -75,16 +76,17 @@ FeatureGate::gate (Feature::Name name, location_t loc,
if (!valid_features.count (name))
{
auto feature = Feature::create (name);
- auto issue = feature.issue ();
- if (issue > 0)
+ if (auto issue = feature.issue ())
{
+ auto issue_number = issue.value ();
const char *fmt_str
= "%s. see issue %u "
"<https://github.com/rust-lang/rust/issues/%u> for more "
"information. add `#![feature(%s)]` to the crate attributes to "
"enable.";
rust_error_at (loc, ErrorCode::E0658, fmt_str, error_msg.c_str (),
- issue, issue, feature.as_string ().c_str ());
+ issue_number, issue_number,
+ feature.as_string ().c_str ());
}
else
{
@@ -169,7 +171,7 @@ FeatureGate::visit (AST::TraitImpl &impl)
"negative_impls are not yet implemented");
AST::DefaultASTVisitor::visit (impl);
-};
+}
void
FeatureGate::visit (AST::BoxExpr &expr)
diff --git a/gcc/rust/checks/errors/rust-feature-gate.h
b/gcc/rust/checks/errors/rust-feature-gate.h
index 7d62a63a61b..7ffb6ef9d66 100644
--- a/gcc/rust/checks/errors/rust-feature-gate.h
+++ b/gcc/rust/checks/errors/rust-feature-gate.h
@@ -20,7 +20,6 @@
#define RUST_FEATURE_GATE_H
#include "rust-ast-visitor.h"
-#include "rust-ast-full.h"
#include "rust-feature.h"
namespace Rust {
@@ -35,153 +34,18 @@ public:
void check (AST::Crate &crate);
void visit (AST::Crate &crate) override;
- void visit (AST::Token &tok) override {}
- void visit (AST::DelimTokenTree &delim_tok_tree) override {}
- void visit (AST::AttrInputMetaItemContainer &input) override {}
- void visit (AST::IdentifierExpr &ident_expr) override {}
- void visit (AST::Lifetime &lifetime) override {}
void visit (AST::LifetimeParam &lifetime_param) override;
void visit (AST::ConstGenericParam &const_param) override;
- void visit (AST::PathInExpression &path) override {}
- void visit (AST::TypePathSegment &segment) override {}
- void visit (AST::TypePathSegmentGeneric &segment) override {}
- void visit (AST::TypePathSegmentFunction &segment) override {}
- void visit (AST::TypePath &path) override {}
- void visit (AST::QualifiedPathInExpression &path) override {}
- void visit (AST::QualifiedPathInType &path) override {}
- void visit (AST::LiteralExpr &expr) override {}
- void visit (AST::AttrInputLiteral &attr_input) override {}
- void visit (AST::AttrInputMacro &attr_input) override {}
- void visit (AST::MetaItemLitExpr &meta_item) override {}
- void visit (AST::MetaItemPathLit &meta_item) override {}
void visit (AST::BorrowExpr &expr) override;
- void visit (AST::DereferenceExpr &expr) override {}
- void visit (AST::ErrorPropagationExpr &expr) override {}
- void visit (AST::NegationExpr &expr) override {}
- void visit (AST::ArithmeticOrLogicalExpr &expr) override {}
- void visit (AST::ComparisonExpr &expr) override {}
- void visit (AST::LazyBooleanExpr &expr) override {}
- void visit (AST::TypeCastExpr &expr) override {}
- void visit (AST::AssignmentExpr &expr) override {}
- void visit (AST::CompoundAssignmentExpr &expr) override {}
- void visit (AST::GroupedExpr &expr) override {}
- void visit (AST::ArrayElemsValues &elems) override {}
- void visit (AST::ArrayElemsCopied &elems) override {}
- void visit (AST::ArrayExpr &expr) override {}
- void visit (AST::ArrayIndexExpr &expr) override {}
- void visit (AST::TupleExpr &expr) override {}
- void visit (AST::TupleIndexExpr &expr) override {}
- void visit (AST::StructExprStruct &expr) override {}
- void visit (AST::StructExprFieldIdentifier &field) override {}
- void visit (AST::StructExprFieldIdentifierValue &field) override {}
- void visit (AST::StructExprFieldIndexValue &field) override {}
- void visit (AST::StructExprStructFields &expr) override {}
- void visit (AST::StructExprStructBase &expr) override {}
- void visit (AST::CallExpr &expr) override {}
- void visit (AST::MethodCallExpr &expr) override {}
- void visit (AST::FieldAccessExpr &expr) override {}
- void visit (AST::ClosureExprInner &expr) override {}
- void visit (AST::ClosureExprInnerTyped &expr) override {}
- void visit (AST::ContinueExpr &expr) override {}
- void visit (AST::BreakExpr &expr) override {}
- void visit (AST::RangeFromToExpr &expr) override {}
- void visit (AST::RangeFromExpr &expr) override {}
- void visit (AST::RangeToExpr &expr) override {}
- void visit (AST::RangeFullExpr &expr) override {}
- void visit (AST::RangeFromToInclExpr &expr) override {}
- void visit (AST::RangeToInclExpr &expr) override {}
- void visit (AST::ReturnExpr &expr) override {}
void visit (AST::BoxExpr &expr) override;
- void visit (AST::UnsafeBlockExpr &expr) override {}
- void visit (AST::LoopExpr &expr) override {}
- void visit (AST::WhileLoopExpr &expr) override {}
- void visit (AST::WhileLetLoopExpr &expr) override {}
- void visit (AST::ForLoopExpr &expr) override {}
- void visit (AST::IfExpr &expr) override {}
- void visit (AST::IfExprConseqElse &expr) override {}
- void visit (AST::IfLetExprConseqElse &expr) override {}
- void visit (AST::AwaitExpr &expr) override {}
- void visit (AST::AsyncBlockExpr &expr) override {}
void visit (AST::TypeParam ¶m) override;
- void visit (AST::LifetimeWhereClauseItem &item) override {}
- void visit (AST::TypeBoundWhereClauseItem &item) override {}
- void visit (AST::Module &module) override {}
- void visit (AST::ExternCrate &crate) override {}
void visit (AST::UseTreeGlob &use_tree) override;
- void visit (AST::UseTreeList &use_tree) override {}
- void visit (AST::UseTreeRebind &use_tree) override {}
- void visit (AST::UseDeclaration &use_decl) override {}
void visit (AST::Function &function) override;
- void visit (AST::TypeAlias &type_alias) override {}
- void visit (AST::StructStruct &struct_item) override {}
- void visit (AST::TupleStruct &tuple_struct) override {}
- void visit (AST::EnumItem &item) override {}
- void visit (AST::EnumItemTuple &item) override {}
- void visit (AST::EnumItemStruct &item) override {}
- void visit (AST::EnumItemDiscriminant &item) override {}
- void visit (AST::Enum &enum_item) override {}
- void visit (AST::Union &union_item) override {}
- void visit (AST::ConstantItem &const_item) override {}
- void visit (AST::StaticItem &static_item) override {}
- void visit (AST::TraitItemConst &item) override {}
- void visit (AST::TraitItemType &item) override {}
void visit (AST::TraitImpl &impl) override;
- void visit (AST::Trait &trait) override {}
void visit (AST::ExternalTypeItem &item) override;
- void visit (AST::ExternalStaticItem &item) override {}
void visit (AST::ExternBlock &block) override;
- void visit (AST::MacroMatchFragment &match) override {}
- void visit (AST::MacroMatchRepetition &match) override {}
- void visit (AST::MacroMatcher &matcher) override {}
void visit (AST::MacroRulesDefinition &rules_def) override;
- void visit (AST::MacroInvocation ¯o_invoc) override {}
- void visit (AST::MetaItemPath &meta_item) override {}
- void visit (AST::MetaItemSeq &meta_item) override {}
- void visit (AST::MetaWord &meta_item) override {}
- void visit (AST::MetaNameValueStr &meta_item) override {}
- void visit (AST::MetaListPaths &meta_item) override {}
- void visit (AST::MetaListNameValueStr &meta_item) override {}
- void visit (AST::LiteralPattern &pattern) override {}
- void visit (AST::IdentifierPattern &pattern) override {}
- void visit (AST::WildcardPattern &pattern) override {}
- void visit (AST::RestPattern &pattern) override {}
- void visit (AST::RangePatternBoundLiteral &bound) override {}
- void visit (AST::RangePatternBoundPath &bound) override {}
- void visit (AST::RangePatternBoundQualPath &bound) override {}
void visit (AST::RangePattern &pattern) override;
- void visit (AST::ReferencePattern &pattern) override {}
- void visit (AST::StructPatternFieldTuplePat &field) override {}
- void visit (AST::StructPatternFieldIdentPat &field) override {}
- void visit (AST::StructPatternFieldIdent &field) override {}
- void visit (AST::StructPattern &pattern) override {}
- void visit (AST::TupleStructItemsNoRange &tuple_items) override {}
- void visit (AST::TupleStructItemsRange &tuple_items) override {}
- void visit (AST::TupleStructPattern &pattern) override {}
- void visit (AST::TuplePatternItemsMultiple &tuple_items) override {}
- void visit (AST::TuplePatternItemsRanged &tuple_items) override {}
- void visit (AST::TuplePattern &pattern) override {}
- void visit (AST::GroupedPattern &pattern) override {}
- void visit (AST::SlicePattern &pattern) override {}
- void visit (AST::AltPattern &pattern) override {}
- void visit (AST::EmptyStmt &stmt) override {}
- void visit (AST::ExprStmt &stmt) override {}
- void visit (AST::TraitBound &bound) override {}
- void visit (AST::ImplTraitType &type) override {}
- void visit (AST::TraitObjectType &type) override {}
- void visit (AST::ParenthesisedType &type) override {}
- void visit (AST::ImplTraitTypeOneBound &type) override {}
- void visit (AST::TraitObjectTypeOneBound &type) override {}
- void visit (AST::TupleType &type) override {}
- void visit (AST::NeverType &type) override {}
- void visit (AST::RawPointerType &type) override {}
- void visit (AST::ReferenceType &type) override {}
- void visit (AST::ArrayType &type) override {}
- void visit (AST::SliceType &type) override {}
- void visit (AST::InferredType &type) override {}
- void visit (AST::BareFunctionType &type) override {}
- void visit (AST::FunctionParam ¶m) override {}
- void visit (AST::VariadicParam ¶m) override {}
- void visit (AST::SelfParam ¶m) override {}
private:
void gate (Feature::Name name, location_t loc, const std::string &error_msg);
diff --git a/gcc/rust/checks/errors/rust-feature.cc
b/gcc/rust/checks/errors/rust-feature.cc
index eba8f5bfea8..6900bb834db 100644
--- a/gcc/rust/checks/errors/rust-feature.cc
+++ b/gcc/rust/checks/errors/rust-feature.cc
@@ -17,50 +17,44 @@
// <http://www.gnu.org/licenses/>.
#include "rust-feature.h"
-#include "rust-session-manager.h"
namespace Rust {
Feature
-Feature::create (Feature::Name name)
+Feature::create (Feature::Name f)
{
- switch (name)
+ switch (f)
{
case Feature::Name::ASSOCIATED_TYPE_BOUNDS:
return Feature (Feature::Name::ASSOCIATED_TYPE_BOUNDS,
Feature::State::ACCEPTED, "associated_type_bounds",
- "1.34.0", 52662, tl::nullopt, "");
+ "1.34.0", 52662);
case Feature::Name::INTRINSICS:
- return Feature (Feature::Name::INTRINSICS, Feature::State::ACCEPTED,
- "intrinsics", "1.0.0", 0, tl::nullopt, "");
+ return Feature (f, Feature::State::ACCEPTED, "intrinsics", "1.0.0");
case Feature::Name::RUSTC_ATTRS:
- return Feature (Feature::Name::RUSTC_ATTRS, Feature::State::ACCEPTED,
- "rustc_attrs", "1.0.0", 0, tl::nullopt, "");
+ return Feature (f, Feature::State::ACCEPTED, "rustc_attrs", "1.0.0");
case Feature::Name::DECL_MACRO:
- return Feature (Feature::Name::DECL_MACRO, Feature::State::ACCEPTED,
- "decl_macro", "1.0.0", 0, tl::nullopt, "");
+ return Feature (f, Feature::State::ACCEPTED, "decl_macro", "1.0.0",
+ 39412);
case Feature::Name::EXTERN_TYPES:
- return Feature (Feature::Name::EXTERN_TYPES, Feature::State::ACTIVE,
- "extern_types", "1.23.0", 43467, tl::nullopt, "");
+ return Feature (f, Feature::State::ACTIVE, "extern_types", "1.23.0",
+ 43467);
case Feature::Name::NEGATIVE_IMPLS:
- return Feature (Feature::Name::NEGATIVE_IMPLS, Feature::State::ACTIVE,
- "negative_impls", "1.0.0", 68318, tl::nullopt, "");
+ return Feature (f, Feature::State::ACTIVE, "negative_impls", "1.0.0",
+ 68318);
case Feature::Name::BOX_SYNTAX:
- return Feature (Feature::Name::BOX_SYNTAX, Feature::State::ACTIVE,
- "box_syntax", "1.0.0", 49733, tl::nullopt, "");
+ return Feature (f, Feature::State::ACTIVE, "box_syntax", "1.0.0", 49733);
case Feature::Name::DROPCK_EYEPATCH:
- return Feature (Feature::Name::DROPCK_EYEPATCH, Feature::State::ACTIVE,
- "dropck_eyepatch", "1.10.0", 34761, tl::nullopt, "");
+ return Feature (f, Feature::State::ACTIVE, "dropck_eyepatch", "1.10.0",
+ 34761);
case Feature::Name::RAW_REF_OP:
- return Feature (Feature::Name::RAW_REF_OP, Feature::State::ACTIVE,
- "raw_ref_op", "1.41.0", 64490, tl::nullopt, "");
+ return Feature (f, Feature::State::ACTIVE, "raw_ref_op", "1.41.0",
64490);
case Feature::Name::EXCLUSIVE_RANGE_PATTERN:
return Feature (Feature::Name::EXCLUSIVE_RANGE_PATTERN,
Feature::State::ACTIVE, "exclusive_range_pattern",
- "1.11.0", 37854, tl::nullopt, "");
+ "1.11.0", 37854);
case Feature::Name::PRELUDE_IMPORT:
- return Feature (Feature::Name::PRELUDE_IMPORT, Feature::State::ACTIVE,
- "prelude_import", "1.0.0", 0, tl::nullopt, "");
+ return Feature (f, Feature::State::ACTIVE, "prelude_import", "1.0.0");
default:
rust_unreachable ();
}
diff --git a/gcc/rust/checks/errors/rust-feature.h
b/gcc/rust/checks/errors/rust-feature.h
index 2b134e2d2c8..e2082c5efa5 100644
--- a/gcc/rust/checks/errors/rust-feature.h
+++ b/gcc/rust/checks/errors/rust-feature.h
@@ -57,16 +57,17 @@ public:
Name name () { return m_name; }
const std::string &description () { return m_description; }
State state () { return m_state; }
- unsigned issue () { return m_issue; }
+ tl::optional<unsigned> issue () { return m_issue; }
static tl::optional<Name> as_name (const std::string &name);
static Feature create (Name name);
private:
Feature (Name name, State state, const char *name_str,
- const char *rustc_since, unsigned issue_number,
- const tl::optional<CompileOptions::Edition> &edition,
- const char *description)
+ const char *rustc_since,
+ tl::optional<unsigned> issue_number = tl::nullopt,
+ const tl::optional<CompileOptions::Edition> &edition = tl::nullopt,
+ const char *description = "")
: m_state (state), m_name (name), m_name_str (name_str),
m_rustc_since (rustc_since), m_issue (issue_number), edition (edition),
m_description (description)
@@ -76,9 +77,9 @@ private:
Name m_name;
std::string m_name_str;
std::string m_rustc_since;
- unsigned m_issue;
+ tl::optional<unsigned> m_issue;
tl::optional<CompileOptions::Edition> edition;
- std::string m_description;
+ std::string m_description; // TODO: Switch to optional?
static const std::map<std::string, Name> name_hash_map;
};
diff --git a/gcc/testsuite/rust/compile/assume.rs
b/gcc/testsuite/rust/compile/assume.rs
index 4dc2fefa86a..f7e0bc855d0 100644
--- a/gcc/testsuite/rust/compile/assume.rs
+++ b/gcc/testsuite/rust/compile/assume.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
mod intrinsics {
extern "rust-intrinsic" {
pub fn assume(value: bool);
diff --git a/gcc/testsuite/rust/compile/issue-1901.rs
b/gcc/testsuite/rust/compile/issue-1901.rs
index dd41ff89346..cfd8ef44fcc 100644
--- a/gcc/testsuite/rust/compile/issue-1901.rs
+++ b/gcc/testsuite/rust/compile/issue-1901.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/compile/issue-1981.rs
b/gcc/testsuite/rust/compile/issue-1981.rs
index b1637ac0260..bfd8d2c3417 100644
--- a/gcc/testsuite/rust/compile/issue-1981.rs
+++ b/gcc/testsuite/rust/compile/issue-1981.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/compile/sizeof-stray-infer-var-bug.rs
b/gcc/testsuite/rust/compile/sizeof-stray-infer-var-bug.rs
index a5f0c2b78fb..82756917034 100644
--- a/gcc/testsuite/rust/compile/sizeof-stray-infer-var-bug.rs
+++ b/gcc/testsuite/rust/compile/sizeof-stray-infer-var-bug.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/compile/torture/intrinsics-8.rs
b/gcc/testsuite/rust/compile/torture/intrinsics-8.rs
index deb19bd431c..b9bd83c7624 100644
--- a/gcc/testsuite/rust/compile/torture/intrinsics-8.rs
+++ b/gcc/testsuite/rust/compile/torture/intrinsics-8.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/compile/torture/transmute-size-check-1.rs
b/gcc/testsuite/rust/compile/torture/transmute-size-check-1.rs
index 6d34fb1b024..7b987797d49 100644
--- a/gcc/testsuite/rust/compile/torture/transmute-size-check-1.rs
+++ b/gcc/testsuite/rust/compile/torture/transmute-size-check-1.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/compile/torture/transmute1.rs
b/gcc/testsuite/rust/compile/torture/transmute1.rs
index b2a0d07a3d7..be9fb1de56d 100644
--- a/gcc/testsuite/rust/compile/torture/transmute1.rs
+++ b/gcc/testsuite/rust/compile/torture/transmute1.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/compile/torture/uninit-intrinsic-1.rs
b/gcc/testsuite/rust/compile/torture/uninit-intrinsic-1.rs
index cbb92feb495..fa329c694ad 100644
--- a/gcc/testsuite/rust/compile/torture/uninit-intrinsic-1.rs
+++ b/gcc/testsuite/rust/compile/torture/uninit-intrinsic-1.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/execute/torture/issue-1436.rs
b/gcc/testsuite/rust/execute/torture/issue-1436.rs
index 4e6996132de..5d909078b5e 100644
--- a/gcc/testsuite/rust/execute/torture/issue-1436.rs
+++ b/gcc/testsuite/rust/execute/torture/issue-1436.rs
@@ -1,4 +1,7 @@
// { dg-options "-w" }
+
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
diff --git a/gcc/testsuite/rust/execute/torture/issue-2583.rs
b/gcc/testsuite/rust/execute/torture/issue-2583.rs
index 46f501ee2d1..4ff12fca49e 100644
--- a/gcc/testsuite/rust/execute/torture/issue-2583.rs
+++ b/gcc/testsuite/rust/execute/torture/issue-2583.rs
@@ -1,3 +1,5 @@
+#![feature(intrinsics)]
+
#[lang = "sized"]
pub trait Sized {}
--
2.45.2
