Skip to content

Commit 0a86d00

Browse files
committed
Basic: Stop enabling NoncopyableGenerics, BorrowingSwitch, and MoveOnlyPartialConsumption.
These features are baseline features and therefore are considered to be implicitly enabled. They don't need to be explicitly enabled or queried for in any part of the compiler.
1 parent dbedb21 commit 0a86d00

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

lib/Basic/LangOptions.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ LangOptions::LangOptions() {
5151
disableFeature(Feature::ExtensionMacros);
5252
#endif
5353

54-
// Note: Introduce default-on language options here.
55-
enableFeature(Feature::NoncopyableGenerics);
56-
enableFeature(Feature::BorrowingSwitch);
57-
enableFeature(Feature::MoveOnlyPartialConsumption);
58-
5954
// Enable any playground options that are enabled by default.
6055
#define PLAYGROUND_OPTION(OptionName, Description, DefaultOn, HighPerfOn) \
6156
if (DefaultOn) \

lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,6 @@ void DiagnosticEmitter::emitCannotPartiallyMutateError(
828828
return;
829829
}
830830
case PartialMutationError::Kind::HasDeinit: {
831-
assert(
832-
astContext.LangOpts.hasFeature(Feature::MoveOnlyPartialConsumption) ||
833-
astContext.LangOpts.hasFeature(
834-
Feature::MoveOnlyPartialReinitialization));
835831
auto diagnostic = [&]() {
836832
switch (kind) {
837833
case PartialMutation::Kind::Consume:
@@ -851,10 +847,6 @@ void DiagnosticEmitter::emitCannotPartiallyMutateError(
851847
return;
852848
}
853849
case PartialMutationError::Kind::NonfrozenImportedType: {
854-
assert(
855-
astContext.LangOpts.hasFeature(Feature::MoveOnlyPartialConsumption) ||
856-
astContext.LangOpts.hasFeature(
857-
Feature::MoveOnlyPartialReinitialization));
858850
auto &nominal = error.getNonfrozenImportedNominal();
859851
auto diagnostic = [&]() {
860852
switch (kind) {
@@ -870,10 +862,6 @@ void DiagnosticEmitter::emitCannotPartiallyMutateError(
870862
return;
871863
}
872864
case PartialMutationError::Kind::NonfrozenUsableFromInlineType: {
873-
assert(
874-
astContext.LangOpts.hasFeature(Feature::MoveOnlyPartialConsumption) ||
875-
astContext.LangOpts.hasFeature(
876-
Feature::MoveOnlyPartialReinitialization));
877865
auto &nominal = error.getNonfrozenUsableFromInlineNominal();
878866
auto diagnostic = [&]() {
879867
switch (kind) {

0 commit comments

Comments
 (0)