Skip to content

Revert "[Batch mode] <rdar://40225790> Merge pull request #16583 from davidungar/batch-remark" #17016

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

Closed
wants to merge 1 commit into from
Closed

Revert "[Batch mode] <rdar://40225790> Merge pull request #16583 from davidungar/batch-remark" #17016

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
6 changes: 0 additions & 6 deletions include/swift/AST/DiagnosticsDriver.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
DIAG(NOTE,ID,Options,Text,Signature)
#endif

#ifndef REMARK
# define REMARK(ID,Options,Text,Signature) \
DIAG(REMARK,ID,Options,Text,Signature)
#endif

WARNING(warning_parallel_execution_not_supported,none,
"parallel execution not supported; falling back to serial execution",
Expand Down Expand Up @@ -155,8 +151,6 @@ WARNING(warn_use_filelists_deprecated, none,
"the option '-driver-use-filelists' is deprecated; use "
"'-driver-filelist-threshold=0' instead", ())

REMARK(remark_using_batch_mode,none, "using batch mode", ())

#ifndef DIAG_NO_UNDEF
# if defined(DIAG)
# undef DIAG
Expand Down
5 changes: 0 additions & 5 deletions lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,11 +716,6 @@ Driver::buildCompilation(const ToolChain &TC,
const bool ContinueBuildingAfterErrors =
BatchMode || ArgList->hasArg(options::OPT_continue_building_after_errors);

// Issue a remark to facilitate recognizing the use of batch mode in the build
// log.
if (BatchMode)
Diags.diagnose(SourceLoc(), diag::remark_using_batch_mode);

if (Diags.hadAnyError())
return nullptr;

Expand Down
6 changes: 4 additions & 2 deletions test/Driver/batch_mode_force_one_batch_repartition.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
// RUN: touch %t/file-01.swift %t/file-02.swift %t/file-03.swift
// RUN: echo 'public func main() {}' >%t/main.swift
//
// RUN: %swiftc_driver -enable-batch-mode -c -emit-module -module-name main -j 2 -driver-force-one-batch-repartition %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -### 2>%t/stderr | %FileCheck %s -check-prefix=CHECK-COMBINED

// RUN: %swiftc_driver -enable-batch-mode -c -emit-module -module-name main -j 2 -driver-force-one-batch-repartition %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -### 2>%t/shouldBeEmpty2 | %FileCheck %s -check-prefix=CHECK-COMBINED
// RUN: test -z "`cat %t/shouldBeEmpty1`"
// RUN: test -z "`cat %t/shouldBeEmpty2`"
//
// CHECK-COMBINED: -primary-file {{.*}}/file-01.swift
// CHECK-COMBINED-NEXT: -primary-file {{.*}}/file-02.swift
// CHECK-COMBINED-NEXT: -primary-file {{.*}}/file-03.swift
Expand Down
9 changes: 4 additions & 5 deletions test/Driver/batch_mode_print_jobs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
// RUN: touch %t/file-01.swift %t/file-02.swift %t/file-03.swift
// RUN: echo 'public func main() {}' >%t/main.swift
//
// RUN: %swiftc_driver -enable-batch-mode -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -driver-print-jobs 2>%t/stderr1 | %FileCheck %s -check-prefix=CHECK-COMBINED
// RUN: %swiftc_driver -enable-batch-mode -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -### 2>%t/stderr2 | %FileCheck %s -check-prefix=CHECK-COMBINED
// RUN: %FileCheck %s -check-prefix=NEGATIVE-CHECK-COMBINED <%t/stderr1
// RUN: %FileCheck %s -check-prefix=NEGATIVE-CHECK-COMBINED <%t/stderr2
// RUN: %swiftc_driver -enable-batch-mode -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -driver-print-jobs 2>%t/shouldBeEmpty1 | %FileCheck %s -check-prefix=CHECK-COMBINED
// RUN: %swiftc_driver -enable-batch-mode -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -### 2>%t/shouldBeEmpty2 | %FileCheck %s -check-prefix=CHECK-COMBINED
// RUN: test -z "`cat %t/shouldBeEmpty1`"
// RUN: test -z "`cat %t/shouldBeEmpty2`"
//
// CHECK-COMBINED: -primary-file {{.*}}/file-01.swift -primary-file {{.*}}/file-02.swift {{.*}}/file-03.swift {{.*}}/main.swift
// NEGATIVE-CHECK-COMBINED-NOT: -primary-file {{.*}}/file-01.swift -primary-file {{.*}}/file-02.swift {{.*}}/file-03.swift {{.*}}/main.swift
12 changes: 0 additions & 12 deletions test/Driver/batch_mode_remark.swift
View file
Open in desktop

This file was deleted.