Skip to content

Commit df1f46c

Browse files
committed
Frontend: Remove -experimental-skip-non-inlinable-function-bodies-is-lazy.
It is no longer needed to work around missing build system support.
1 parent 91a3abc commit df1f46c

File tree

3 files changed

+0
-25
lines changed

3 files changed

+0
-25
lines changed

include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,11 +1150,6 @@ def experimental_skip_all_function_bodies:
11501150
Flag<["-"], "experimental-skip-all-function-bodies">,
11511151
HelpText<"Skip type-checking function bodies and all SIL generation">;
11521152

1153-
def experimental_skip_non_inlinable_function_bodies_is_lazy
1154-
: Flag<["-"], "experimental-skip-non-inlinable-function-bodies-is-lazy">,
1155-
HelpText<"Infer lazy typechecking for "
1156-
"-experimental-skip-non-inlinable-function-bodies">;
1157-
11581153
def experimental_allow_module_with_compiler_errors:
11591154
Flag<["-"], "experimental-allow-module-with-compiler-errors">,
11601155
Flags<[HelpHidden]>,

lib/Frontend/CompilerInvocation.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,11 +1162,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
11621162
if (Args.hasArg(OPT_enable_library_evolution)) {
11631163
Opts.SkipNonExportableDecls |=
11641164
Args.hasArg(OPT_experimental_skip_non_exportable_decls);
1165-
1166-
Opts.SkipNonExportableDecls |=
1167-
Args.hasArg(OPT_experimental_skip_non_inlinable_function_bodies) &&
1168-
Args.hasArg(
1169-
OPT_experimental_skip_non_inlinable_function_bodies_is_lazy);
11701165
} else {
11711166
if (Args.hasArg(OPT_experimental_skip_non_exportable_decls))
11721167
Diags.diagnose(SourceLoc(), diag::ignoring_option_requires_option,
@@ -1692,21 +1687,11 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
16921687

16931688
if (Args.hasArg(OPT_enable_library_evolution)) {
16941689
Opts.EnableLazyTypecheck |= Args.hasArg(OPT_experimental_lazy_typecheck);
1695-
Opts.EnableLazyTypecheck |=
1696-
Args.hasArg(OPT_experimental_skip_non_inlinable_function_bodies) &&
1697-
Args.hasArg(
1698-
OPT_experimental_skip_non_inlinable_function_bodies_is_lazy);
16991690
} else {
17001691
if (Args.hasArg(OPT_experimental_lazy_typecheck))
17011692
Diags.diagnose(SourceLoc(), diag::ignoring_option_requires_option,
17021693
"-experimental-lazy-typecheck",
17031694
"-enable-library-evolution");
1704-
1705-
if (Args.hasArg(
1706-
OPT_experimental_skip_non_inlinable_function_bodies_is_lazy))
1707-
Diags.diagnose(SourceLoc(), diag::ignoring_option_requires_option,
1708-
"-experimental-skip-non-inlinable-function-bodies-is-lazy",
1709-
"-enable-library-evolution");
17101695
}
17111696

17121697
// HACK: The driver currently erroneously passes all flags to module interface

test/Serialization/lazy-typecheck.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,3 @@
1515
// and -experimental-skip-non-exportable-decls can be used by the same client as in (1).
1616
// RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -enable-library-evolution -parse-as-library -package-name Package -DFLAG -emit-module -emit-module-path %t/lazy-skip-non-inlinable/lazy_typecheck.swiftmodule -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck -experimental-skip-non-inlinable-function-bodies -experimental-skip-non-exportable-decls
1717
// RUN: %target-swift-frontend -package-name Package -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-non-inlinable
18-
19-
// (4) Verify that a module built with -experimental-skip-non-inlinable-function-bodies-is-lazy implies
20-
// -experimental-lazy-typecheck and -experimental-skip-non-exportable-decls.
21-
// RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -enable-library-evolution -parse-as-library -package-name Package -DFLAG -emit-module -emit-module-path %t/lazy-skip-non-inlinable-is-lazy/lazy_typecheck.swiftmodule -debug-forbid-typecheck-prefix NoTypecheck -experimental-skip-non-inlinable-function-bodies -experimental-skip-non-inlinable-function-bodies-is-lazy
22-
// RUN: %target-swift-frontend -package-name Package -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-non-inlinable-is-lazy

0 commit comments

Comments
 (0)