[cfe-commits] r122831 - in /cfe/trunk: include/clang/Driver/ lib/Driver/ lib/Frontend/ test/Analysis/ test/CodeGenObjC/ test/Index/ test/SemaObjC/
Fariborz Jahanian
fjahanian at apple.com
Tue Jan 4 12:05:20 PST 2011
Author: fjahanian
Date: Tue Jan 4 14:05:20 2011
New Revision: 122831
URL: http://llvm.org/viewvc/llvm-project?rev=122831&view=rev
Log:
Fold -fobjc-nonfragile-abi2 into -fobjc-nonfragile-abi.
// rdar://8818375
Modified:
cfe/trunk/include/clang/Driver/CC1Options.td
cfe/trunk/lib/Driver/Tools.cpp
cfe/trunk/lib/Frontend/CompilerInvocation.cpp
cfe/trunk/test/Analysis/unused-ivars.m
cfe/trunk/test/CodeGenObjC/debug-info-default-synth-ivar.m
cfe/trunk/test/CodeGenObjC/debug-info-getter-name.m
cfe/trunk/test/CodeGenObjC/default-property-synthesis.m
cfe/trunk/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m
cfe/trunk/test/CodeGenObjC/objc2-nonfragile-abi-impl.m
cfe/trunk/test/Index/complete-synthesized.m
cfe/trunk/test/SemaObjC/default-synthesize-1.m
cfe/trunk/test/SemaObjC/default-synthesize.m
cfe/trunk/test/SemaObjC/direct-synthesized-ivar-access.m
cfe/trunk/test/SemaObjC/duplicate-ivar-in-class-extension.m
cfe/trunk/test/SemaObjC/ivar-in-class-extension.m
cfe/trunk/test/SemaObjC/ivar-in-implementations.m
cfe/trunk/test/SemaObjC/property-and-class-extension.m
cfe/trunk/test/SemaObjC/property-and-ivar-use.m
cfe/trunk/test/SemaObjC/provisional-ivar-lookup.m
cfe/trunk/test/SemaObjC/synth-provisional-ivars.m
cfe/trunk/test/SemaObjC/synthesized-ivar.m
cfe/trunk/test/SemaObjC/warn-implicit-atomic-property.m
Modified: cfe/trunk/include/clang/Driver/CC1Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/CC1Options.td (original)
+++ cfe/trunk/include/clang/Driver/CC1Options.td Tue Jan 4 14:05:20 2011
@@ -469,8 +469,6 @@
HelpText<"Enable Objective-C Ivar layout bitmap print trace">;
def fobjc_nonfragile_abi : Flag<"-fobjc-nonfragile-abi">,
HelpText<"enable objective-c's nonfragile abi">;
-def fobjc_nonfragile_abi2 : Flag<"-fobjc-nonfragile-abi2">,
- HelpText<"enable objective-c's enhanced nonfragile abi">;
def ftrapv : Flag<"-ftrapv">,
HelpText<"Trap on integer overflow">;
def ftrapv_handler : Separate<"-ftrapv-handler">,
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Tue Jan 4 14:05:20 2011
@@ -1468,10 +1468,7 @@
}
if (Version == 2 || Version == 3) {
- if (Version == 2)
- CmdArgs.push_back("-fobjc-nonfragile-abi");
- else
- CmdArgs.push_back("-fobjc-nonfragile-abi2");
+ CmdArgs.push_back("-fobjc-nonfragile-abi");
// -fobjc-dispatch-method is only relevant with the nonfragile-abi, and
// legacy is the default.
Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Tue Jan 4 14:05:20 2011
@@ -549,7 +549,7 @@
if (Opts.ObjCNonFragileABI)
Res.push_back("-fobjc-nonfragile-abi");
if (Opts.ObjCNonFragileABI2)
- Res.push_back("-fobjc-nonfragile-abi2");
+ Res.push_back("-fobjc-nonfragile-abi");
if (Opts.ObjCDefaultSynthProperties)
Res.push_back("-fobjc-default-synthesize-properties");
// NoInline is implicit.
@@ -1423,9 +1423,8 @@
Opts.ObjCConstantStringClass =
Args.getLastArgValue(OPT_fconstant_string_class);
Opts.ObjCNonFragileABI = Args.hasArg(OPT_fobjc_nonfragile_abi);
- Opts.ObjCNonFragileABI2 = Args.hasArg(OPT_fobjc_nonfragile_abi2);
- if (Opts.ObjCNonFragileABI2)
- Opts.ObjCNonFragileABI = true;
+ if (Opts.ObjCNonFragileABI)
+ Opts.ObjCNonFragileABI2 = true;
Opts.ObjCDefaultSynthProperties =
Args.hasArg(OPT_fobjc_default_synthesize_properties);
Opts.CatchUndefined = Args.hasArg(OPT_fcatch_undefined_behavior);
Modified: cfe/trunk/test/Analysis/unused-ivars.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/unused-ivars.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/unused-ivars.m (original)
+++ cfe/trunk/test/Analysis/unused-ivars.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fobjc-nonfragile-abi2 -fblocks -analyze -analyzer-check-objc-unused-ivars %s -verify
+// RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -analyze -analyzer-check-objc-unused-ivars %s -verify
//===--- BEGIN: Delta-debugging reduced headers. --------------------------===//
Modified: cfe/trunk/test/CodeGenObjC/debug-info-default-synth-ivar.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/debug-info-default-synth-ivar.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenObjC/debug-info-default-synth-ivar.m (original)
+++ cfe/trunk/test/CodeGenObjC/debug-info-default-synth-ivar.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -emit-llvm -g %s -o %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -emit-llvm -g %s -o %t
// RUN: grep DW_TAG_member %t | count 5
// rdar://8493239
Modified: cfe/trunk/test/CodeGenObjC/debug-info-getter-name.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/debug-info-getter-name.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenObjC/debug-info-getter-name.m (original)
+++ cfe/trunk/test/CodeGenObjC/debug-info-getter-name.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -S -g %s -o %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -S -g %s -o %t
// RUN: grep "\[InstanceVariablesEverywhereButTheInterface someString\]" %t | count 6
//rdar: //8498026
Modified: cfe/trunk/test/CodeGenObjC/default-property-synthesis.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/default-property-synthesis.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenObjC/default-property-synthesis.m (original)
+++ cfe/trunk/test/CodeGenObjC/default-property-synthesis.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
// rdar://7923851.
// Superclass declares property. Subclass redeclares the same property.
Modified: cfe/trunk/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m (original)
+++ cfe/trunk/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m Tue Jan 4 14:05:20 2011
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
-// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
+// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
// rdar: // 7824380
@interface Super {
Modified: cfe/trunk/test/CodeGenObjC/objc2-nonfragile-abi-impl.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/objc2-nonfragile-abi-impl.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenObjC/objc2-nonfragile-abi-impl.m (original)
+++ cfe/trunk/test/CodeGenObjC/objc2-nonfragile-abi-impl.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
// rdar://7547942.
@interface Base @end
Modified: cfe/trunk/test/Index/complete-synthesized.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/complete-synthesized.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/Index/complete-synthesized.m (original)
+++ cfe/trunk/test/Index/complete-synthesized.m Tue Jan 4 14:05:20 2011
@@ -35,20 +35,20 @@
}
@end
-// RUN: c-index-test -code-completion-at=%s:24:1 -Xclang -fobjc-nonfragile-abi2 %s | FileCheck -check-prefix=CHECK-CC1 %s
+// RUN: c-index-test -code-completion-at=%s:24:1 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC1 %s
// CHECK-CC1: NotImplemented:{TypedText _Bool} (50)
// CHECK-CC1: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
// CHECK-CC1-NOT: prop2
// CHECK-CC1: ObjCPropertyDecl:{ResultType short}{TypedText prop3} (35)
// CHECK-CC1: ObjCPropertyDecl:{ResultType double}{TypedText prop4} (35)
-// RUN: c-index-test -code-completion-at=%s:30:2 -Xclang -fobjc-nonfragile-abi2 %s | FileCheck -check-prefix=CHECK-CC2 %s
+// RUN: c-index-test -code-completion-at=%s:30:2 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC2 %s
// CHECK-CC2: NotImplemented:{TypedText _Bool} (50)
// CHECK-CC2: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
// CHECK-CC2-NOT: prop3
// CHECK-CC2: ObjCPropertyDecl:{ResultType double}{TypedText prop4} (35)
-// RUN: c-index-test -code-completion-at=%s:34:2 -Xclang -fobjc-nonfragile-abi2 %s | FileCheck -check-prefix=CHECK-CC3 %s
+// RUN: c-index-test -code-completion-at=%s:34:2 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC3 %s
// CHECK-CC3: NotImplemented:{TypedText _Bool} (50)
// CHECK-CC3: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
// CHECK-CC3: ObjCPropertyDecl:{ResultType double}{TypedText prop4}
Modified: cfe/trunk/test/SemaObjC/default-synthesize-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/default-synthesize-1.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/default-synthesize-1.m (original)
+++ cfe/trunk/test/SemaObjC/default-synthesize-1.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
@interface NSObject
- (void) release;
Modified: cfe/trunk/test/SemaObjC/default-synthesize.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/default-synthesize.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/default-synthesize.m (original)
+++ cfe/trunk/test/SemaObjC/default-synthesize.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
@interface NSString @end
Modified: cfe/trunk/test/SemaObjC/direct-synthesized-ivar-access.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/direct-synthesized-ivar-access.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/direct-synthesized-ivar-access.m (original)
+++ cfe/trunk/test/SemaObjC/direct-synthesized-ivar-access.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -Wnonfragile-abi2 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -Wnonfragile-abi2 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
// rdar://8673791
@interface I {
Modified: cfe/trunk/test/SemaObjC/duplicate-ivar-in-class-extension.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/duplicate-ivar-in-class-extension.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/duplicate-ivar-in-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/duplicate-ivar-in-class-extension.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
@interface Root @end
Modified: cfe/trunk/test/SemaObjC/ivar-in-class-extension.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-in-class-extension.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-in-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-in-class-extension.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
@interface SomeClass @end
Modified: cfe/trunk/test/SemaObjC/ivar-in-implementations.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-in-implementations.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-in-implementations.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-in-implementations.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
@interface Super @end
Modified: cfe/trunk/test/SemaObjC/property-and-class-extension.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-and-class-extension.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property-and-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/property-and-class-extension.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
/**
When processing @synthesize, treat ivars in a class extension the same as ivars in the class @interface,
Modified: cfe/trunk/test/SemaObjC/property-and-ivar-use.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-and-ivar-use.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property-and-ivar-use.m (original)
+++ cfe/trunk/test/SemaObjC/property-and-ivar-use.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
// Do not issue error if 'ivar' used previously belongs to the inherited class
// and has same name as @dynalic property in current class.
Modified: cfe/trunk/test/SemaObjC/provisional-ivar-lookup.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/provisional-ivar-lookup.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/provisional-ivar-lookup.m (original)
+++ cfe/trunk/test/SemaObjC/provisional-ivar-lookup.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-default-synthesize-properties -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-default-synthesize-properties -fobjc-nonfragile-abi -verify %s
// rdar:// 8565343
@interface Foo {
Modified: cfe/trunk/test/SemaObjC/synth-provisional-ivars.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/synth-provisional-ivars.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/synth-provisional-ivars.m (original)
+++ cfe/trunk/test/SemaObjC/synth-provisional-ivars.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
int bar;
Modified: cfe/trunk/test/SemaObjC/synthesized-ivar.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/synthesized-ivar.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/synthesized-ivar.m (original)
+++ cfe/trunk/test/SemaObjC/synthesized-ivar.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
@interface I
{
}
Modified: cfe/trunk/test/SemaObjC/warn-implicit-atomic-property.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/warn-implicit-atomic-property.m?rev=122831&r1=122830&r2=122831&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/warn-implicit-atomic-property.m (original)
+++ cfe/trunk/test/SemaObjC/warn-implicit-atomic-property.m Tue Jan 4 14:05:20 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -Wimplicit-atomic-properties -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -Wimplicit-atomic-properties -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
// rdar://8774580
@interface Super
More information about the cfe-commits
mailing list