dang created this revision.
dang added a reviewer: Bigcheese.
Herald added subscribers: llvm-commits, cfe-commits, dexonsmith.
Herald added projects: clang, LLVM.
- The new option, -arcmt-action, is a simple enum based option.
- The driver is modified to translate the existing -ccc-acmt-* options
accordingly
Depends on D83298 <https://reviews.llvm.org/D83298>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D83315
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/ToolChains/Clang.cpp
clang/lib/Frontend/CompilerInvocation.cpp
clang/test/ARCMT/GC-check-warn-nsalloc.m
clang/test/ARCMT/GC-check.m
clang/test/ARCMT/atautorelease-check.m
clang/test/ARCMT/check-api.m
clang/test/ARCMT/check-with-pch.m
clang/test/ARCMT/check-with-serialized-diag.m
clang/test/ARCMT/checking-in-arc.m
clang/test/ARCMT/checking.m
clang/test/ARCMT/cxx-checking.mm
clang/test/ARCMT/driver-migrate.m
clang/test/ARCMT/migrate-emit-errors.m
clang/test/ARCMT/migrate-plist-output.m
clang/test/ARCMT/migrate-space-in-path.m
clang/test/ARCMT/migrate-with-pch.m
clang/test/ARCMT/migrate.m
clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
clang/test/ARCMT/nonobjc-to-objc-cast-2.m
clang/test/ARCMT/releases-driver.m
clang/test/ARCMT/releases-driver.m.result
clang/test/ARCMT/verify.m
clang/test/ARCMT/with-arc-mode-modify.m
clang/test/ARCMT/with-arc-mode-modify.m.result
llvm/utils/TableGen/OptParserEmitter.cpp
Index: llvm/utils/TableGen/OptParserEmitter.cpp
===================================================================
--- llvm/utils/TableGen/OptParserEmitter.cpp
+++ llvm/utils/TableGen/OptParserEmitter.cpp
@@ -102,7 +102,7 @@
OS << ", ";
emitScopedNormalizedValue(OS, DefaultValue);
OS << ", ";
- emitScopedNormalizedValue(OS, NormalizerRetTy);
+ OS << NormalizerRetTy;
OS << ", ";
OS << Normalizer;
OS << ", ";
Index: clang/test/ARCMT/with-arc-mode-modify.m.result
===================================================================
--- clang/test/ARCMT/with-arc-mode-modify.m.result
+++ clang/test/ARCMT/with-arc-mode-modify.m.result
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -x objective-c %s.result
// RUN: cat %s > %t
-// RUN: %clang_cc1 -arcmt-modify -fsyntax-only -fobjc-arc -x objective-c %t
+// RUN: %clang_cc1 -arcmt-action modify -fsyntax-only -fobjc-arc -x objective-c %t
// RUN: diff %t %s.result
// RUN: rm %t
Index: clang/test/ARCMT/with-arc-mode-modify.m
===================================================================
--- clang/test/ARCMT/with-arc-mode-modify.m
+++ clang/test/ARCMT/with-arc-mode-modify.m
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -x objective-c %s.result
// RUN: cat %s > %t
-// RUN: %clang_cc1 -arcmt-modify -fsyntax-only -fobjc-arc -x objective-c %t
+// RUN: %clang_cc1 -arcmt-action modify -fsyntax-only -fobjc-arc -x objective-c %t
// RUN: diff %t %s.result
// RUN: rm %t
Index: clang/test/ARCMT/verify.m
===================================================================
--- clang/test/ARCMT/verify.m
+++ clang/test/ARCMT/verify.m
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -arcmt-check -verify %s
-// RUN: not %clang_cc1 -arcmt-check -verify %t.invalid 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -arcmt-action check -verify %s
+// RUN: not %clang_cc1 -arcmt-action check -verify %t.invalid 2>&1 | FileCheck %s
#if 0
// expected-error {{should be ignored}}
Index: clang/test/ARCMT/releases-driver.m.result
===================================================================
--- clang/test/ARCMT/releases-driver.m.result
+++ clang/test/ARCMT/releases-driver.m.result
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
// RUN: cat %s > %t
-// RUN: %clang_cc1 -arcmt-modify -triple x86_64-apple-macosx10.6 -x objective-c %t
+// RUN: %clang_cc1 -arcmt-action modify -triple x86_64-apple-macosx10.6 -x objective-c %t
// RUN: diff %t %s.result
// RUN: rm %t
Index: clang/test/ARCMT/releases-driver.m
===================================================================
--- clang/test/ARCMT/releases-driver.m
+++ clang/test/ARCMT/releases-driver.m
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
// RUN: cat %s > %t
-// RUN: %clang_cc1 -arcmt-modify -triple x86_64-apple-macosx10.6 -x objective-c %t
+// RUN: %clang_cc1 -arcmt-action modify -triple x86_64-apple-macosx10.6 -x objective-c %t
// RUN: diff %t %s.result
// RUN: rm %t
Index: clang/test/ARCMT/nonobjc-to-objc-cast-2.m
===================================================================
--- clang/test/ARCMT/nonobjc-to-objc-cast-2.m
+++ clang/test/ARCMT/nonobjc-to-objc-cast-2.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-darwin10 %s
#include "Common.h"
Index: clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
===================================================================
--- clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
+++ clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -verify %s
+// RUN: %clang_cc1 -arcmt-action check -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -verify %s
// rdar://10387088
typedef const void * CFTypeRef;
CFTypeRef CFBridgingRetain(id X);
Index: clang/test/ARCMT/migrate.m
===================================================================
--- clang/test/ARCMT/migrate.m
+++ clang/test/ARCMT/migrate.m
@@ -1,5 +1,5 @@
// RUN: rm -rf %t
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t %S/Inputs/test1.m.in -x objective-c
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t %S/Inputs/test2.m.in -x objective-c
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t %S/Inputs/test1.m.in -x objective-c
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t %S/Inputs/test2.m.in -x objective-c
// RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %S/Inputs/test1.m.in.result %S/Inputs/test2.m.in.result %S/Inputs/test.h.result
// RUN: rm -rf %t
Index: clang/test/ARCMT/migrate-with-pch.m
===================================================================
--- clang/test/ARCMT/migrate-with-pch.m
+++ clang/test/ARCMT/migrate-with-pch.m
@@ -1,6 +1,6 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -x objective-c %S/Common.h -emit-pch -o %t.pch
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t %S/Inputs/test1.m.in -x objective-c -include-pch %t.pch
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t %S/Inputs/test2.m.in -x objective-c -include-pch %t.pch
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t %S/Inputs/test1.m.in -x objective-c -include-pch %t.pch
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t %S/Inputs/test2.m.in -x objective-c -include-pch %t.pch
// RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %S/Inputs/test1.m.in.result %S/Inputs/test2.m.in.result %S/Inputs/test.h.result
// RUN: rm -rf %t
Index: clang/test/ARCMT/migrate-space-in-path.m
===================================================================
--- clang/test/ARCMT/migrate-space-in-path.m
+++ clang/test/ARCMT/migrate-space-in-path.m
@@ -1,5 +1,5 @@
// RUN: rm -rf %t.migrate
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test1.m.in -x objective-c
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test2.m.in -x objective-c
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test1.m.in -x objective-c
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test2.m.in -x objective-c
// RUN: c-arcmt-test -mt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %S/Inputs/"with space"/test1.m.in.result %S/Inputs/"with space"/test2.m.in.result %S/Inputs/"with space"/test.h.result
// RUN: rm -rf %t.migrate
Index: clang/test/ARCMT/migrate-plist-output.m
===================================================================
--- clang/test/ARCMT/migrate-plist-output.m
+++ clang/test/ARCMT/migrate-plist-output.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.dir -arcmt-migrate-report-output %t.plist %s
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t.dir -arcmt-migrate-report-output %t.plist %s
// RUN: FileCheck %s -input-file=%t.plist
// RUN: rm -rf %t.dir
Index: clang/test/ARCMT/migrate-emit-errors.m
===================================================================
--- clang/test/ARCMT/migrate-emit-errors.m
+++ clang/test/ARCMT/migrate-emit-errors.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t -arcmt-migrate-emit-errors %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -arcmt-action migrate -mt-migrate-directory %t -arcmt-migrate-emit-errors %s 2>&1 | FileCheck %s
// RUN: rm -rf %t
@protocol NSObject
@@ -9,4 +9,4 @@
[p release];
}
-// CHECK: error: ARC forbids explicit message send of 'release'
\ No newline at end of file
+// CHECK: error: ARC forbids explicit message send of 'release'
Index: clang/test/ARCMT/driver-migrate.m
===================================================================
--- clang/test/ARCMT/driver-migrate.m
+++ clang/test/ARCMT/driver-migrate.m
@@ -1,6 +1,6 @@
// RUN: %clang -### -ccc-arcmt-migrate /foo/bar -fsyntax-only %s 2>&1 | FileCheck %s
-// CHECK: "-arcmt-migrate" "-mt-migrate-directory" "{{[^"]*}}/foo/bar"
+// CHECK: "-arcmt-action" "migrate" "-mt-migrate-directory" "{{[^"]*}}/foo/bar"
// RUN: touch %t.o
// RUN: %clang -ccc-arcmt-check -target i386-apple-darwin9 -### %t.o 2> %t.log
Index: clang/test/ARCMT/cxx-checking.mm
===================================================================
--- clang/test/ARCMT/cxx-checking.mm
+++ clang/test/ARCMT/cxx-checking.mm
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fsyntax-only -fblocks %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-darwin10 -fsyntax-only -fblocks %s
// Classes that have an Objective-C object pointer.
struct HasObjectMember0 {
Index: clang/test/ARCMT/checking.m
===================================================================
--- clang/test/ARCMT/checking.m
+++ clang/test/ARCMT/checking.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fblocks -Werror %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-darwin10 -fblocks -Werror %s
#if __has_feature(objc_arc)
#define NS_AUTOMATED_REFCOUNT_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))
Index: clang/test/ARCMT/checking-in-arc.m
===================================================================
--- clang/test/ARCMT/checking-in-arc.m
+++ clang/test/ARCMT/checking-in-arc.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -fobjc-arc -fobjc-runtime=macosx-10.8.0 -triple x86_64-apple-darwin12 -fblocks -Werror %s
+// RUN: %clang_cc1 -arcmt-action check -fobjc-arc -fobjc-runtime=macosx-10.8.0 -triple x86_64-apple-darwin12 -fblocks -Werror %s
#if __has_feature(objc_arc)
#define NS_AUTOMATED_REFCOUNT_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))
Index: clang/test/ARCMT/check-with-serialized-diag.m
===================================================================
--- clang/test/ARCMT/check-with-serialized-diag.m
+++ clang/test/ARCMT/check-with-serialized-diag.m
@@ -35,7 +35,7 @@
[a retainCount];
}
-// RUN: not %clang_cc1 -arcmt-check -triple x86_64-apple-darwin10 %s -serialize-diagnostic-file %t.diag
+// RUN: not %clang_cc1 -arcmt-action check -triple x86_64-apple-darwin10 %s -serialize-diagnostic-file %t.diag
// RUN: c-index-test -read-diagnostics %t.diag > %t 2>&1
// RUN: FileCheck --input-file=%t %s
Index: clang/test/ARCMT/check-with-pch.m
===================================================================
--- clang/test/ARCMT/check-with-pch.m
+++ clang/test/ARCMT/check-with-pch.m
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -x objective-c -triple x86_64-apple-darwin10 %S/Common.h -emit-pch -o %t.pch
-// RUN: %clang_cc1 -include-pch %t.pch -arcmt-check -verify -triple x86_64-apple-darwin10 -fblocks -Werror %s
+// RUN: %clang_cc1 -include-pch %t.pch -arcmt-action check -verify -triple x86_64-apple-darwin10 -fblocks -Werror %s
// REQUIRES: x86-registered-target
// rdar://9601437
Index: clang/test/ARCMT/check-api.m
===================================================================
--- clang/test/ARCMT/check-api.m
+++ clang/test/ARCMT/check-api.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-macosx10.7 %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-macosx10.7 %s
#include "Common.h"
Index: clang/test/ARCMT/atautorelease-check.m
===================================================================
--- clang/test/ARCMT/atautorelease-check.m
+++ clang/test/ARCMT/atautorelease-check.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-darwin10 %s
#if __has_feature(objc_arr)
#define NS_AUTOMATED_REFCOUNT_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))
Index: clang/test/ARCMT/GC-check.m
===================================================================
--- clang/test/ARCMT/GC-check.m
+++ clang/test/ARCMT/GC-check.m
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-gc-only %s
-// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-gc-only -x objective-c++ %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-darwin10 -fobjc-gc-only %s
+// RUN: %clang_cc1 -arcmt-action check -verify -triple x86_64-apple-darwin10 -fobjc-gc-only -x objective-c++ %s
#define CF_AUTOMATED_REFCOUNT_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))
typedef unsigned NSUInteger;
Index: clang/test/ARCMT/GC-check-warn-nsalloc.m
===================================================================
--- clang/test/ARCMT/GC-check-warn-nsalloc.m
+++ clang/test/ARCMT/GC-check-warn-nsalloc.m
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -arcmt-check -no-ns-alloc-error -triple x86_64-apple-darwin10 -fobjc-gc-only %s 2>&1 | grep 'warning: \[rewriter\] call returns pointer to GC managed memory'
-// RUN: %clang_cc1 -arcmt-check -no-ns-alloc-error -triple x86_64-apple-darwin10 -fobjc-gc-only -x objective-c++ %s 2>&1 | grep 'warning: \[rewriter\] call returns pointer to GC managed memory'
+// RUN: %clang_cc1 -arcmt-action check -no-ns-alloc-error -triple x86_64-apple-darwin10 -fobjc-gc-only %s 2>&1 | grep 'warning: \[rewriter\] call returns pointer to GC managed memory'
+// RUN: %clang_cc1 -arcmt-action check -no-ns-alloc-error -triple x86_64-apple-darwin10 -fobjc-gc-only -x objective-c++ %s 2>&1 | grep 'warning: \[rewriter\] call returns pointer to GC managed memory'
// TODO: Investigate VerifyDiagnosticConsumer failures on these tests when using -verify.
// rdar://10532541
Index: clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- clang/lib/Frontend/CompilerInvocation.cpp
+++ clang/lib/Frontend/CompilerInvocation.cpp
@@ -239,7 +239,7 @@
template <typename T, typename U>
static T mergeForwardValue(T KeyPath, U Value) {
- return Value;
+ return static_cast<T>(Value);
}
template <typename T, typename U> static T mergeMaskValue(T KeyPath, U Value) {
@@ -2023,23 +2023,6 @@
Opts.AuxTargetFeatures = Args.getAllArgValues(OPT_aux_target_feature);
Opts.StatsFile = std::string(Args.getLastArgValue(OPT_stats_file));
- if (const Arg *A = Args.getLastArg(OPT_arcmt_check,
- OPT_arcmt_modify,
- OPT_arcmt_migrate)) {
- switch (A->getOption().getID()) {
- default:
- llvm_unreachable("missed a case");
- case OPT_arcmt_check:
- Opts.ARCMTAction = FrontendOptions::ARCMT_Check;
- break;
- case OPT_arcmt_modify:
- Opts.ARCMTAction = FrontendOptions::ARCMT_Modify;
- break;
- case OPT_arcmt_migrate:
- Opts.ARCMTAction = FrontendOptions::ARCMT_Migrate;
- break;
- }
- }
Opts.MTMigrateDir =
std::string(Args.getLastArgValue(OPT_mt_migrate_directory));
Opts.ARCMTMigrateReportOut =
Index: clang/lib/Driver/ToolChains/Clang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Clang.cpp
+++ clang/lib/Driver/ToolChains/Clang.cpp
@@ -3165,16 +3165,17 @@
options::OPT_ccc_arcmt_modify,
options::OPT_ccc_arcmt_migrate)) {
ARCMTEnabled = true;
+ CmdArgs.push_back("-arcmt-action");
switch (A->getOption().getID()) {
default: llvm_unreachable("missed a case");
case options::OPT_ccc_arcmt_check:
- CmdArgs.push_back("-arcmt-check");
+ CmdArgs.push_back("check");
break;
case options::OPT_ccc_arcmt_modify:
- CmdArgs.push_back("-arcmt-modify");
+ CmdArgs.push_back("modify");
break;
case options::OPT_ccc_arcmt_migrate:
- CmdArgs.push_back("-arcmt-migrate");
+ CmdArgs.push_back("migrate");
CmdArgs.push_back("-mt-migrate-directory");
CmdArgs.push_back(A->getValue());
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -3657,7 +3657,7 @@
HelpText<"The relocation model to use">, Values<"static,pic,ropi,rwpi,ropi-rwpi,dynamic-no-pic">,
NormalizedValuesScope<"llvm::Reloc">,
NormalizedValues<["Static", "PIC_", "ROPI", "RWPI", "ROPI_RWPI", "DynamicNoPIC"]>,
- MarshallingInfoString<"CodeGenOpts.RelocationModel", "PIC_", "Model">,
+ MarshallingInfoString<"CodeGenOpts.RelocationModel", "PIC_", "llvm::Reloc::Model">,
AutoNormalizeEnum;
def fno_math_builtin : Flag<["-"], "fno-math-builtin">,
HelpText<"Disable implicit builtin knowledge of math functions">;
@@ -4097,12 +4097,13 @@
def mt_migrate_directory : Separate<["-"], "mt-migrate-directory">,
HelpText<"Directory for temporary files produced during ARC or ObjC migration">;
-def arcmt_check : Flag<["-"], "arcmt-check">,
- HelpText<"Check for ARC migration issues that need manual handling">;
-def arcmt_modify : Flag<["-"], "arcmt-modify">,
- HelpText<"Apply modifications to files to conform to ARC">;
-def arcmt_migrate : Flag<["-"], "arcmt-migrate">,
- HelpText<"Apply modifications and produces temporary files that conform to ARC">;
+
+def arcmt_action : Separate<["-"], "arcmt-action">, Flags<[CC1Option, NoDriverOption]>,
+ HelpText<"The ARC migration action to take">, Values<"check,modify,migrate">,
+ NormalizedValuesScope<"FrontendOptions">,
+ NormalizedValues<["ARCMT_Check", "ARCMT_Modify", "ARCMT_Migrate"]>,
+ MarshallingInfoString<"FrontendOpts.ARCMTAction", "ARCMT_None", "unsigned">,
+ AutoNormalizeEnum;
def opt_record_file : Separate<["-"], "opt-record-file">,
HelpText<"File name to use for YAML optimization record output">;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
