Skip to content

Renamed flag to -enable-lexical-lifetimes. #40404

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 1 commit into from
Dec 7, 2021
Merged

Renamed flag to -enable-lexical-lifetimes. #40404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions include/swift/Option/FrontendOptions.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ def enable_experimental_concurrency :
def disable_lexical_lifetimes :
Flag<["-"], "disable-lexical-lifetimes">,
HelpText<"Disables early lexical lifetimes. Mutually exclusive with "
"-enable-experimental-lexical-lifetimes">;
"-enable-lexical-lifetimes">;

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

def enable_experimental_move_only :
Flag<["-"], "enable-experimental-move-only">,
Expand Down
2 changes: 1 addition & 1 deletion lib/Frontend/CompilerInvocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
// If experimental move only is enabled, always enable lexical lifetime as
// well. Move only depends on lexical lifetimes.
bool enableExperimentalLexicalLifetimes =
Args.hasArg(OPT_enable_experimental_lexical_lifetimes) ||
Args.hasArg(OPT_enable_lexical_lifetimes) ||
Args.hasArg(OPT_enable_experimental_move_only);
// Error if both experimental lexical lifetimes and disable lexical lifetimes
// are both set.
Expand Down
2 changes: 1 addition & 1 deletion test/SILGen/lexical_lifetime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-swift-emit-silgen -enable-experimental-lexical-lifetimes -module-name borrow -parse-stdlib %s | %FileCheck %s
// RUN: %target-swift-emit-silgen -enable-lexical-lifetimes -module-name borrow -parse-stdlib %s | %FileCheck %s

import Swift

Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/allocbox_to_stack_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all %s -allocbox-to-stack -enable-experimental-lexical-lifetimes | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all %s -allocbox-to-stack -enable-lexical-lifetimes | %FileCheck %s

sil_stage raw

Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/inline_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -enable-experimental-lexical-lifetimes | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -enable-lexical-lifetimes | %FileCheck %s

import Swift

Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s

// =============================================================================
// Copied from mem2reg_ossa.sil {{
Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_lifetime_nontrivial.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s

import Builtin
import Swift
Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_lifetime_nontrivial_casts.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s

import Builtin
import Swift
Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_liveness_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s

import Builtin
import Swift
Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_resilient_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

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

import Builtin
import Swift
Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_simple_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg | %FileCheck %s

sil_stage canonical

Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/mem2reg_unreachable_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -enable-experimental-lexical-lifetimes %s -mem2reg
// RUN: %target-sil-opt -enable-sil-verify-all -enable-lexical-lifetimes %s -mem2reg

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

Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/sroa_lifetime.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt -enable-sil-verify-all -sroa %s -enable-experimental-lexical-lifetimes | %FileCheck %s
// RUN: %target-sil-opt -enable-sil-verify-all -sroa %s -enable-lexical-lifetimes | %FileCheck %s

sil_stage canonical

Expand Down
6 changes: 3 additions & 3 deletions tools/sil-opt/SILOpt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ EnableExperimentalConcurrency("enable-experimental-concurrency",
llvm::cl::desc("Enable experimental concurrency model."));

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

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

static llvm::cl::opt<bool>
EnableExperimentalMoveOnly("enable-experimental-move-only",
Expand Down Expand Up @@ -534,7 +534,7 @@ int main(int argc, char **argv) {
if (enableExperimentalLexicalLifetimes && DisableLexicalLifetimes) {
fprintf(
stderr,
"Error! Can not specify both -enable-experimental-lexical-lifetimes "
"Error! Can not specify both -enable-lexical-lifetimes "
"and -disable-lexical-lifetimes!\n");
exit(-1);
}
Expand Down
2 changes: 1 addition & 1 deletion validation-test/SILOptimizer/lexical-lifetimes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-lexical-lifetimes -Xfrontend -enable-copy-propagation) | %FileCheck %s
// RUN: %target-run-simple-swift(-Xfrontend -enable-lexical-lifetimes -Xfrontend -enable-copy-propagation) | %FileCheck %s

// REQUIRES: executable_test

Expand Down