Skip to content

[5.9] [SE-0400] SE-0400: Enable InitAccessors feature by default #67963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2023
Merged

[5.9] [SE-0400] SE-0400: Enable InitAccessors feature by default #67963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59dcbf0
[Frontend/NFC] SE-0400: Enable `InitAccessors` feature by default
xedin Jul 31, 2023
d5b29e6
Remove unnecessary `--enable-experimental-feature InitAccessors` from…
DougGregor Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/swift/Basic/Features.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)
EXPERIMENTAL_FEATURE(FlowSensitiveConcurrencyCaptures, false)
EXPERIMENTAL_FEATURE(CodeItemMacros, false)
EXPERIMENTAL_FEATURE(TupleConformances, false)
EXPERIMENTAL_FEATURE(InitAccessors, false)

SUPPRESSIBLE_LANGUAGE_FEATURE(ExtensionMacroAttr, 0, "@attached(extension)", true)

Expand Down
4 changes: 0 additions & 4 deletions lib/AST/ASTPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3243,10 +3243,6 @@ static bool usesFeatureTupleConformances(Decl *decl) {
return false;
}

static bool usesFeatureInitAccessors(Decl *decl) {
return false;
}

static bool usesFeatureLayoutPrespecialization(Decl *decl) {
auto &attrs = decl->getAttrs();
return std::any_of(attrs.begin(), attrs.end(), [](auto *attr) {
Expand Down
4 changes: 1 addition & 3 deletions lib/Parse/ParseDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7140,9 +7140,7 @@ static bool parseAccessorIntroducer(Parser &P,
}
}

bool isInitAccessor = (P.Context.LangOpts.hasFeature(Feature::InitAccessors)
&& P.Tok.is(tok::kw_init));
if (!(P.Tok.is(tok::identifier) || isInitAccessor) ||
if (!(P.Tok.is(tok::identifier) || P.Tok.is(tok::kw_init)) ||
P.Tok.isEscapedIdentifier()) {
return true;
}
Expand Down
5 changes: 2 additions & 3 deletions test/Interpreter/init_accessors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-feature -Xfrontend InitAccessors) | %FileCheck %s
// RUN: %target-run-simple-swift(-O -Xfrontend -enable-experimental-feature -Xfrontend InitAccessors) | %FileCheck %s
// RUN: %target-run-simple-swift | %FileCheck %s
// RUN: %target-run-simple-swift(-O) | %FileCheck %s

// REQUIRES: executable_test
// REQUIRES: asserts

struct TestInit {
var x: Int
Expand Down
5 changes: 1 addition & 4 deletions test/ModuleInterface/Observable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -plugin-path %swift-host-lib-dir/plugins -disable-availability-checking -enable-experimental-feature InitAccessors
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -plugin-path %swift-host-lib-dir/plugins -disable-availability-checking
// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -module-name Library -disable-availability-checking
// RUN: %FileCheck %s < %t/Library.swiftinterface

// Asserts is required for '-enable-experimental-feature InitAccessors'.
// REQUIRES: asserts

// REQUIRES: swift_swift_parser
// REQUIRES: observation

Expand Down
4 changes: 1 addition & 3 deletions test/SILOptimizer/init_accessor_definite_init_diagnostics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// RUN: %target-swift-frontend -enable-experimental-feature InitAccessors -enable-copy-propagation=requested-passes-only -emit-sil -primary-file %s -o /dev/null -verify

// REQUIRES: asserts
// RUN: %target-swift-frontend -enable-copy-propagation=requested-passes-only -emit-sil -primary-file %s -o /dev/null -verify

struct Test1 {
var x: Int // expected-note {{variable defined here}}
Expand Down
4 changes: 1 addition & 3 deletions test/SILOptimizer/init_accessor_raw_sil_lowering.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// RUN: %target-swift-frontend -enable-experimental-feature InitAccessors -Xllvm -sil-print-after=definite-init -emit-sil -module-name assign_or_init_lowering %s -o /dev/null 2>&1 | %FileCheck %s

// REQUIRES: asserts
// RUN: %target-swift-frontend -Xllvm -sil-print-after=definite-init -emit-sil -module-name assign_or_init_lowering %s -o /dev/null 2>&1 | %FileCheck %s

protocol Storage<T> {
associatedtype T
Expand Down
4 changes: 1 addition & 3 deletions test/SILOptimizer/init_accessors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// RUN: %target-swift-frontend -enable-experimental-feature InitAccessors -primary-file %s -Onone -emit-sil \
// RUN: %target-swift-frontend -primary-file %s -Onone -emit-sil \
// RUN: -Xllvm -sil-print-after=raw-sil-inst-lowering \
// RUN: -o /dev/null -module-name init_accessors 2>&1 | %FileCheck %s

// REQUIRES: asserts

class NSObject {}

struct TestInit {
Expand Down
6 changes: 1 addition & 5 deletions test/Serialization/init_accessors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
// RUN: %empty-directory(%t/sdk)
// RUN: split-file %s %t/src

// REQUIRES: asserts

// RUN: %target-swift-frontend -emit-module %t/src/PublicModule.swift \
// RUN: -module-name PublicModule -swift-version 5 \
// RUN: -emit-module-path %t/sdk/PublicModule.swiftmodule \
// RUN: -enable-experimental-feature InitAccessors
// RUN: -emit-module-path %t/sdk/PublicModule.swiftmodule

// RUN: %target-swift-frontend -typecheck %t/src/Client.swift \
// RUN: -enable-experimental-feature InitAccessors \
// RUN: -module-name Client -I %t/sdk

//--- PublicModule.swift
Expand Down
4 changes: 1 addition & 3 deletions test/decl/var/init_accessors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// RUN: %target-typecheck-verify-swift -enable-experimental-feature InitAccessors

// REQUIRES: asserts
// RUN: %target-typecheck-verify-swift

func test_empty_init_accessor() {
struct Test {
Expand Down
7 changes: 2 additions & 5 deletions test/stdlib/Observation/Observable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
// REQUIRES: swift_swift_parser, executable_test

// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library -enable-experimental-feature InitAccessors -enable-experimental-feature Macros -enable-experimental-feature ExtensionMacros -Xfrontend -plugin-path -Xfrontend %swift-host-lib-dir/plugins)
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library -enable-experimental-feature Macros -enable-experimental-feature ExtensionMacros -Xfrontend -plugin-path -Xfrontend %swift-host-lib-dir/plugins)

// Run this test via the swift-plugin-server
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library -enable-experimental-feature InitAccessors -enable-experimental-feature Macros -enable-experimental-feature ExtensionMacros -Xfrontend -external-plugin-path -Xfrontend %swift-host-lib-dir/plugins#%swift-plugin-server)

// Asserts is required for '-enable-experimental-feature InitAccessors'.
// REQUIRES: asserts
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library -enable-experimental-feature Macros -enable-experimental-feature ExtensionMacros -Xfrontend -external-plugin-path -Xfrontend %swift-host-lib-dir/plugins#%swift-plugin-server)

// REQUIRES: observation
// REQUIRES: concurrency
Expand Down
4 changes: 2 additions & 2 deletions test/stdlib/Observation/ObservableAvailabilityCycle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// REQUIRES: swift_swift_parser

// RUN: %target-swift-frontend -typecheck -parse-as-library -enable-experimental-feature InitAccessors -external-plugin-path %swift-host-lib-dir/plugins#%swift-plugin-server -primary-file %s %S/Inputs/ObservableClass.swift
// RUN: %target-swift-frontend -typecheck -parse-as-library -external-plugin-path %swift-host-lib-dir/plugins#%swift-plugin-server -primary-file %s %S/Inputs/ObservableClass.swift

// RUN: %target-swift-frontend -typecheck -parse-as-library -enable-experimental-feature InitAccessors -external-plugin-path %swift-host-lib-dir/plugins#%swift-plugin-server %s -primary-file %S/Inputs/ObservableClass.swift
// RUN: %target-swift-frontend -typecheck -parse-as-library -external-plugin-path %swift-host-lib-dir/plugins#%swift-plugin-server %s -primary-file %S/Inputs/ObservableClass.swift

// REQUIRES: observation
// REQUIRES: concurrency
Expand Down
5 changes: 1 addition & 4 deletions test/stdlib/Observation/ObservableDidSetWillSet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// REQUIRES: swift_swift_parser, executable_test

// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -enable-experimental-feature InitAccessors -enable-experimental-feature Macros -enable-experimental-feature ExtensionMacros -Xfrontend -plugin-path -Xfrontend %swift-host-lib-dir/plugins) | %FileCheck %s

// Asserts is required for '-enable-experimental-feature InitAccessors'.
// REQUIRES: asserts
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -enable-experimental-feature Macros -enable-experimental-feature ExtensionMacros -Xfrontend -plugin-path -Xfrontend %swift-host-lib-dir/plugins) | %FileCheck %s

// REQUIRES: observation
// REQUIRES: concurrency
Expand Down