Skip to content

Commit fe4d9af

Browse files
swift-ciswift-ci
authored
Merge pull request #40404 from nate-chandler/lexical_lifetimes/renamed_flag
2 parents 53c17df + 1961be8 commit fe4d9af

15 files changed

+21
-21
lines changed

‎include/swift/Option/FrontendOptions.td

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,12 @@ def enable_experimental_concurrency :
262262
def disable_lexical_lifetimes :
263263
Flag<["-"], "disable-lexical-lifetimes">,
264264
HelpText<"Disables early lexical lifetimes. Mutually exclusive with "
265-
"-enable-experimental-lexical-lifetimes">;
265+
"-enable-lexical-lifetimes">;
266266

267-
def enable_experimental_lexical_lifetimes :
268-
Flag<["-"], "enable-experimental-lexical-lifetimes">,
269-
HelpText<"Enable experimental lexical lifetimes. Mutually exclusive with "
270-
"-disable-early-lexical-lifetimes">;
267+
def enable_lexical_lifetimes :
268+
Flag<["-"], "enable-lexical-lifetimes">,
269+
HelpText<"Enable lexical lifetimes. Mutually exclusive with "
270+
"-disable-lexical-lifetimes">;
271271

272272
def enable_experimental_move_only :
273273
Flag<["-"], "enable-experimental-move-only">,

‎lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
14521452
// If experimental move only is enabled, always enable lexical lifetime as
14531453
// well. Move only depends on lexical lifetimes.
14541454
bool enableExperimentalLexicalLifetimes =
1455-
Args.hasArg(OPT_enable_experimental_lexical_lifetimes) ||
1455+
Args.hasArg(OPT_enable_lexical_lifetimes) ||
14561456
Args.hasArg(OPT_enable_experimental_move_only);
14571457
// Error if both experimental lexical lifetimes and disable lexical lifetimes
14581458
// are both set.

‎test/SILGen/lexical_lifetime.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-silgen -enable-experimental-lexical-lifetimes -module-name borrow -parse-stdlib %s | %FileCheck %s
1+
// RUN: %target-swift-emit-silgen -enable-lexical-lifetimes -module-name borrow -parse-stdlib %s | %FileCheck %s
22

33
import Swift
44

‎test/SILOptimizer/allocbox_to_stack_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all %s -allocbox-to-stack -enable-experimental-lexical-lifetimes | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all %s -allocbox-to-stack -enable-lexical-lifetimes | %FileCheck %s
22

33
sil_stage raw
44

‎test/SILOptimizer/inline_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -enable-experimental-lexical-lifetimes | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -enable-lexical-lifetimes | %FileCheck %s
22

33
import Swift
44

‎test/SILOptimizer/mem2reg_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s
22

33
// =============================================================================
44
// Copied from mem2reg_ossa.sil {{

‎test/SILOptimizer/mem2reg_lifetime_nontrivial.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s
22

33
import Builtin
44
import Swift

‎test/SILOptimizer/mem2reg_lifetime_nontrivial_casts.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s
22

33
import Builtin
44
import Swift

‎test/SILOptimizer/mem2reg_liveness_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s
22

33
import Builtin
44
import Swift

‎test/SILOptimizer/mem2reg_resilient_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg -enable-library-evolution | %FileCheck %s
2+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg -enable-library-evolution | %FileCheck %s
33

44
import Builtin
55
import Swift

‎test/SILOptimizer/mem2reg_simple_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s
22

33
sil_stage canonical
44

‎test/SILOptimizer/mem2reg_unreachable_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg
1+
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg
22

33
// Make sure we are not crashing on blocks that are not dominated by the entry block.
44

‎test/SILOptimizer/sroa_lifetime.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-sil-verify-all -sroa %s -enable-experimental-lexical-lifetimes | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all -sroa %s -enable-lexical-lifetimes | %FileCheck %s
22

33
sil_stage canonical
44

‎tools/sil-opt/SILOpt.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ EnableExperimentalConcurrency("enable-experimental-concurrency",
106106
llvm::cl::desc("Enable experimental concurrency model."));
107107

108108
static llvm::cl::opt<bool> EnableExperimentalLexicalLifetimes(
109-
"enable-experimental-lexical-lifetimes",
109+
"enable-lexical-lifetimes",
110110
llvm::cl::desc("Enable experimental lexical lifetimes. Mutually exclusive "
111111
"with disable-lexical-lifetimes."));
112112

113113
static llvm::cl::opt<bool> DisableLexicalLifetimes(
114114
"disable-lexical-lifetimes",
115115
llvm::cl::desc("Disable the default early lexical lifetimes. Mutually "
116-
"exclusive with enable-experimental-lexical-lifetimes"));
116+
"exclusive with enable-lexical-lifetimes"));
117117

118118
static llvm::cl::opt<bool>
119119
EnableExperimentalMoveOnly("enable-experimental-move-only",
@@ -534,7 +534,7 @@ int main(int argc, char **argv) {
534534
if (enableExperimentalLexicalLifetimes && DisableLexicalLifetimes) {
535535
fprintf(
536536
stderr,
537-
"Error! Can not specify both -enable-experimental-lexical-lifetimes "
537+
"Error! Can not specify both -enable-lexical-lifetimes "
538538
"and -disable-lexical-lifetimes!\n");
539539
exit(-1);
540540
}

‎validation-test/SILOptimizer/lexical-lifetimes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-lexical-lifetimes -Xfrontend -enable-copy-propagation) | %FileCheck %s
1+
// RUN: %target-run-simple-swift(-Xfrontend -enable-lexical-lifetimes -Xfrontend -enable-copy-propagation) | %FileCheck %s
22

33
// REQUIRES: executable_test
44

0 commit comments

Comments
 (0)