Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit d1e40d5

Browse files
rjmccallrjmccall
committed
Make -fobjc-nonfragile-abi the -cc1 default, since it's the
increasingly prevailing case to the point that new features like ARC don't even support the fragile ABI anymore. This required a little bit of reshuffling with exceptions because a check was assuming that ObjCNonFragileABI was only being set in ObjC mode, and that's actually a bit obnoxious to do. Most, though, it involved a perl script to translate a ton of test cases. Mostly no functionality change for driver users, although there are corner cases with disabling language-specific exceptions that we should handle more correctly now. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140957 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 6a835dd commit d1e40d5

File tree

309 files changed

+470
-452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+470
-452
lines changed

‎include/clang/Driver/CC1Options.td

+2-2
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ def fobjc_default_synthesize_properties : Flag<"-fobjc-default-synthesize-proper
524524
HelpText<"enable the default synthesis of Objective-C properties">;
525525
def print_ivar_layout : Flag<"-print-ivar-layout">,
526526
HelpText<"Enable Objective-C Ivar layout bitmap print trace">;
527-
def fobjc_nonfragile_abi : Flag<"-fobjc-nonfragile-abi">,
528-
HelpText<"enable objective-c's nonfragile abi">;
527+
def fobjc_fragile_abi : Flag<"-fobjc-fragile-abi">,
528+
HelpText<"Use Objective-C's fragile ABI">;
529529
def fno_objc_infer_related_result_type : Flag<
530530
"-fno-objc-infer-related-result-type">,
531531
HelpText<

‎lib/CodeGen/CodeGenModule.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -460,12 +460,32 @@ void CodeGenModule::SetLLVMFunctionAttributes(const Decl *D,
460460
F->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
461461
}
462462

463+
/// Determines whether the language options require us to model
464+
/// unwind exceptions. We treat -fexceptions as mandating this
465+
/// except under the fragile ObjC ABI with only ObjC exceptions
466+
/// enabled. This means, for example, that C with -fexceptions
467+
/// enables this.
468+
static bool hasUnwindExceptions(const LangOptions &Features) {
469+
// If exceptions are completely disabled, obviously this is false.
470+
if (!Features.Exceptions) return false;
471+
472+
// If C++ exceptions are enabled, this is true.
473+
if (Features.CXXExceptions) return true;
474+
475+
// If ObjC exceptions are enabled, this depends on the ABI.
476+
if (Features.ObjCExceptions) {
477+
if (!Features.ObjCNonFragileABI) return false;
478+
}
479+
480+
return true;
481+
}
482+
463483
void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
464484
llvm::Function *F) {
465485
if (CodeGenOpts.UnwindTables)
466486
F->setHasUWTable();
467487

468-
if (!Features.Exceptions && !Features.ObjCNonFragileABI)
488+
if (!hasUnwindExceptions(Features))
469489
F->addFnAttr(llvm::Attribute::NoUnwind);
470490

471491
if (D->hasAttr<NakedAttr>()) {

‎lib/Driver/Tools.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1965,9 +1965,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
19651965
}
19661966
}
19671967

1968-
if (objcABIVersion == 2 || objcABIVersion == 3) {
1969-
CmdArgs.push_back("-fobjc-nonfragile-abi");
1970-
1968+
if (objcABIVersion == 1) {
1969+
CmdArgs.push_back("-fobjc-fragile-abi");
1970+
} else {
19711971
// -fobjc-dispatch-method is only relevant with the nonfragile-abi, and
19721972
// legacy is the default.
19731973
if (!Args.hasFlag(options::OPT_fobjc_legacy_dispatch,

‎lib/Frontend/CompilerInvocation.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -623,10 +623,8 @@ static void LangOptsToArgs(const LangOptions &Opts,
623623
Res.push_back("-fmsc-version=" + llvm::utostr(Opts.MSCVersion));
624624
if (Opts.Borland)
625625
Res.push_back("-fborland-extensions");
626-
if (Opts.ObjCNonFragileABI)
627-
Res.push_back("-fobjc-nonfragile-abi");
628-
if (Opts.ObjCNonFragileABI2)
629-
Res.push_back("-fobjc-nonfragile-abi");
626+
if (!Opts.ObjCNonFragileABI)
627+
Res.push_back("-fobjc-fragile-abi");
630628
if (Opts.ObjCDefaultSynthProperties)
631629
Res.push_back("-fobjc-default-synthesize-properties");
632630
// NoInline is implicit.
@@ -1619,7 +1617,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
16191617
Opts.setGC(LangOptions::HybridGC);
16201618
else if (Args.hasArg(OPT_fobjc_arc)) {
16211619
Opts.ObjCAutoRefCount = 1;
1622-
if (!Args.hasArg(OPT_fobjc_nonfragile_abi))
1620+
if (Args.hasArg(OPT_fobjc_fragile_abi))
16231621
Diags.Report(diag::err_arc_nonfragile_abi);
16241622
}
16251623

@@ -1723,7 +1721,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
17231721
Opts.NeXTRuntime = !Args.hasArg(OPT_fgnu_runtime);
17241722
Opts.ObjCConstantStringClass =
17251723
Args.getLastArgValue(OPT_fconstant_string_class);
1726-
Opts.ObjCNonFragileABI = Args.hasArg(OPT_fobjc_nonfragile_abi);
1724+
Opts.ObjCNonFragileABI = !Args.hasArg(OPT_fobjc_fragile_abi);
17271725
if (Opts.ObjCNonFragileABI)
17281726
Opts.ObjCNonFragileABI2 = true;
17291727
Opts.ObjCDefaultSynthProperties =

‎test/ARCMT/api.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/api.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/assign-prop-no-arc-runtime.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.6 -fobjc-nonfragile-abi -fsyntax-only %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.6 -fsyntax-only %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/assign-prop-no-arc-runtime.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.6 -fobjc-nonfragile-abi -fsyntax-only %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.6 -fsyntax-only %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/assign-prop-with-arc-runtime.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi -fsyntax-only %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fsyntax-only %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/assign-prop-with-arc-runtime.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi -fsyntax-only %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fsyntax-only %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/atautorelease-2.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface NSAutoreleasePool

‎test/ARCMT/atautorelease-2.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface NSAutoreleasePool

‎test/ARCMT/atautorelease-3.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface NSAutoreleasePool

‎test/ARCMT/atautorelease-3.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface NSAutoreleasePool

‎test/ARCMT/atautorelease-check.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi %s
1+
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 %s
22

33
#if __has_feature(objc_arr)
44
#define NS_AUTOMATED_REFCOUNT_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode")))

‎test/ARCMT/atautorelease.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/atautorelease.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/autoreleases.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
typedef unsigned char BOOL;

‎test/ARCMT/autoreleases.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
typedef unsigned char BOOL;

‎test/ARCMT/check-api.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi %s
1+
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-macosx10.7 %s
22

33
#include "Common.h"
44

‎test/ARCMT/checking.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi %s
1+
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 %s
22

33
#include "Common.h"
44

‎test/ARCMT/cxx-checking.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fblocks -Warc-abi %s
1+
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fsyntax-only -fblocks -Warc-abi %s
22

33
// Classes that have an Objective-C object pointer.
44
struct HasObjectMember0 { // expected-warning{{'HasObjectMember0' cannot be shared between ARC and non-ARC code; add a copy constructor, a copy assignment operator, and a destructor to make it ABI-compatible}}

‎test/ARCMT/cxx-rewrite.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c++ %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c++ %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c++ %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c++ %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/cxx-rewrite.mm.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c++ %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c++ %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c++ %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c++ %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/dealloc.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface A

‎test/ARCMT/dealloc.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface A

‎test/ARCMT/init.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface NSObject

‎test/ARCMT/init.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
@interface NSObject

‎test/ARCMT/migrate-emit-errors.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t -arcmt-migrate-emit-errors %s -fobjc-nonfragile-abi 2>&1 | FileCheck %s
1+
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t -arcmt-migrate-emit-errors %s 2>&1 | FileCheck %s
22
// RUN: rm -rf %t
33

44
@protocol NSObject

‎test/ARCMT/migrate-plist-output.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.dir -arcmt-migrate-report-output %t.plist %s -fobjc-nonfragile-abi
1+
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.dir -arcmt-migrate-report-output %t.plist %s
22
// RUN: FileCheck %s -input-file=%t.plist
33
// RUN: rm -rf %t.dir
44

‎test/ARCMT/migrate-space-in-path.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: rm -rf %t.migrate
2-
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.migrate %S/"with space"/test1.m.in -x objective-c -fobjc-nonfragile-abi
3-
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.migrate %S/"with space"/test2.m.in -x objective-c -fobjc-nonfragile-abi
2+
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.migrate %S/"with space"/test1.m.in -x objective-c
3+
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.migrate %S/"with space"/test2.m.in -x objective-c
44
// RUN: c-arcmt-test -arcmt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %S/"with space"/test1.m.in.result %S/"with space"/test2.m.in.result %S/"with space"/test.h.result
55
// RUN: rm -rf %t.migrate

‎test/ARCMT/migrate.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: rm -rf %t
2-
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t %S/Inputs/test1.m.in -x objective-c -fobjc-nonfragile-abi
3-
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t %S/Inputs/test2.m.in -x objective-c -fobjc-nonfragile-abi
2+
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t %S/Inputs/test1.m.in -x objective-c
3+
// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t %S/Inputs/test2.m.in -x objective-c
44
// RUN: c-arcmt-test -arcmt-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
55
// RUN: rm -rf %t

‎test/ARCMT/nonobjc-to-objc-cast-2.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi %s
1+
// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 %s
22

33
#include "Common.h"
44

‎test/ARCMT/nonobjc-to-objc-cast.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/nonobjc-to-objc-cast.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#include "Common.h"

‎test/ARCMT/releases-driver.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
1+
// RUN: %clang_cc1 -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
22
// RUN: cp %s %t
3-
// RUN: %clang_cc1 -arcmt-modify -triple x86_64-apple-macosx10.6 -fobjc-nonfragile-abi -x objective-c %t
3+
// RUN: %clang_cc1 -arcmt-modify -triple x86_64-apple-macosx10.6 -x objective-c %t
44
// RUN: diff %t %s.result
55
// RUN: rm %t
66

‎test/ARCMT/releases-driver.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
1+
// RUN: %clang_cc1 -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
22
// RUN: cp %s %t
3-
// RUN: %clang_cc1 -arcmt-modify -triple x86_64-apple-macosx10.6 -fobjc-nonfragile-abi -x objective-c %t
3+
// RUN: %clang_cc1 -arcmt-modify -triple x86_64-apple-macosx10.6 -x objective-c %t
44
// RUN: diff %t %s.result
55
// RUN: rm %t
66

‎test/ARCMT/releases.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -fobjc-nonfragile-abi -fobjc-exceptions -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-exceptions -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -fobjc-exceptions -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-exceptions -fblocks -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#define nil 0

‎test/ARCMT/releases.m.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 -fobjc-nonfragile-abi -fobjc-exceptions -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
2-
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-exceptions -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
1+
// RUN: %clang_cc1 -fobjc-exceptions -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
2+
// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-exceptions -fblocks -fsyntax-only -x objective-c %s > %t
33
// RUN: diff %t %s.result
44

55
#define nil 0

0 commit comments

Comments
 (0)