Skip to content

Commit 3de4297

Browse files
graydongraydon
committed
[NamedLazyMemberLoading] Flip flag polarity: on by default, optionally off.
1 parent cafb596 commit 3de4297

15 files changed

+36
-36
lines changed

‎include/swift/Basic/LangOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ namespace swift {
154154
bool IterativeTypeChecker = false;
155155

156156
/// \brief Enable named lazy member loading.
157-
bool NamedLazyMemberLoading = false;
157+
bool NamedLazyMemberLoading = true;
158158

159159
/// Debug the generic signatures computed by the generic signature builder.
160160
bool DebugGenericSignatures = false;

‎include/swift/Option/FrontendOptions.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ def propagate_constraints : Flag<["-"], "propagate-constraints">,
155155
def iterative_type_checker : Flag<["-"], "iterative-type-checker">,
156156
HelpText<"Enable the iterative type checker">;
157157

158-
def enable_named_lazy_member_loading : Flag<["-"], "enable-named-lazy-member-loading">,
159-
HelpText<"Enable per-name lazy member loading">;
158+
def disable_named_lazy_member_loading : Flag<["-"], "disable-named-lazy-member-loading">,
159+
HelpText<"Disable per-name lazy member loading">;
160160

161161
def debug_generic_signatures : Flag<["-"], "debug-generic-signatures">,
162162
HelpText<"Debug generic signatures">;

‎lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
849849
Opts.DebugConstraintSolver |= Args.hasArg(OPT_debug_constraints);
850850
Opts.EnableConstraintPropagation |= Args.hasArg(OPT_propagate_constraints);
851851
Opts.IterativeTypeChecker |= Args.hasArg(OPT_iterative_type_checker);
852-
Opts.NamedLazyMemberLoading |= Args.hasArg(OPT_enable_named_lazy_member_loading);
852+
Opts.NamedLazyMemberLoading &= !Args.hasArg(OPT_disable_named_lazy_member_loading);
853853
Opts.DebugGenericSignatures |= Args.hasArg(OPT_debug_generic_signatures);
854854

855855
Opts.DebuggerSupport |= Args.hasArg(OPT_debugger_support);

‎test/NameBinding/named_lazy_member_loading_objc_interface.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -typecheck %s
77
//
88
// Check that named-lazy-member-loading reduces the number of Decls deserialized
9-
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-pre %s
10-
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
9+
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -disable-named-lazy-member-loading -stats-output-dir %t/stats-pre %s
10+
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-post %s
1111
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
1212

1313
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_objc_protocol.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -typecheck %s
77
//
88
// Check that named-lazy-member-loading reduces the number of Decls deserialized
9-
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-pre %s
10-
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
9+
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -disable-named-lazy-member-loading -stats-output-dir %t/stats-pre %s
10+
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-post %s
1111
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
1212

1313
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_class.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_class_type.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_derived_class.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_derived_class_type.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_enum.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_proto.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -3' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_struct.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_struct_ext.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/NameBinding/named_lazy_member_loading_swift_struct_ext_mem.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats-pre && mkdir -p %t/stats-post
22
//
33
// Compile swiftmodule with decl member name tables
4-
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule -enable-named-lazy-member-loading %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
4+
// RUN: %target-swift-frontend -emit-module -o %t/NamedLazyMembers.swiftmodule %S/Inputs/NamedLazyMembers/NamedLazyMembers.swift
55
//
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
7-
// RUN: %target-swift-frontend -typecheck -I %t -typecheck -stats-output-dir %t/stats-pre %s
8-
// RUN: %target-swift-frontend -typecheck -I %t -enable-named-lazy-member-loading -stats-output-dir %t/stats-post %s
7+
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
8+
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
99
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers

‎test/Serialization/xref-extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// REQUIRES: asserts
1515

1616
// CHECK_NESTED-LABEL: Statistics
17-
// CHECK_NESTED: 6 Serialization - # of decls deserialized
17+
// CHECK_NESTED: 5 Serialization - # of decls deserialized
1818
// outer struct, initializer + self param,
1919
// inner struct, initializer + self param,
2020
// extension, func + self param

0 commit comments

Comments
 (0)