[llvm-branch-commits] [cfe-branch] r122860 - in /cfe/branches/Apple/whitney: include/clang/Driver/Options.td include/clang/Driver/ToolChain.h lib/Driver/ToolChains.h lib/Driver/Tools.cpp test/Index/complete-synthesized.m test/SemaObjC/duplicate-ivar-in-class-extension.m
Daniel Dunbar
daniel at zuster.org
Tue Jan 4 18:20:04 PST 2011
Author: ddunbar
Date: Tue Jan 4 20:20:03 2011
New Revision: 122860
URL: http://llvm.org/viewvc/llvm-project?rev=122860&view=rev
Log:
Driver: Ignore -fobjc-default-synthesize-properties for now.
Modified:
cfe/branches/Apple/whitney/include/clang/Driver/Options.td
cfe/branches/Apple/whitney/include/clang/Driver/ToolChain.h
cfe/branches/Apple/whitney/lib/Driver/ToolChains.h
cfe/branches/Apple/whitney/lib/Driver/Tools.cpp
cfe/branches/Apple/whitney/test/Index/complete-synthesized.m
cfe/branches/Apple/whitney/test/SemaObjC/duplicate-ivar-in-class-extension.m
Modified: cfe/branches/Apple/whitney/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/include/clang/Driver/Options.td?rev=122860&r1=122859&r2=122860&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/include/clang/Driver/Options.td (original)
+++ cfe/branches/Apple/whitney/include/clang/Driver/Options.td Tue Jan 4 20:20:03 2011
@@ -336,8 +336,6 @@
def fno_math_errno : Flag<"-fno-math-errno">, Group<f_Group>;
def fno_merge_all_constants : Flag<"-fno-merge-all-constants">, Group<f_Group>;
def fno_ms_extensions : Flag<"-fno-ms-extensions">, Group<f_Group>;
-def fno_objc_default_synthesize_properties
- : Flag<"-fno-objc-default-synthesize-properties">, Group<f_Group>;
def fno_objc_legacy_dispatch : Flag<"-fno-objc-legacy-dispatch">, Group<f_Group>;
def fno_omit_frame_pointer : Flag<"-fno-omit-frame-pointer">, Group<f_Group>;
def fno_pascal_strings : Flag<"-fno-pascal-strings">, Group<f_Group>;
@@ -357,7 +355,6 @@
def fno_zero_initialized_in_bss : Flag<"-fno-zero-initialized-in-bss">, Group<f_Group>;
def fobjc_atdefs : Flag<"-fobjc-atdefs">, Group<clang_ignored_f_Group>;
def fobjc_call_cxx_cdtors : Flag<"-fobjc-call-cxx-cdtors">, Group<clang_ignored_f_Group>;
-def fobjc_default_synthesize_properties : Flag<"-fobjc-default-synthesize-properties">, Group<f_Group>;
def fobjc_gc_only : Flag<"-fobjc-gc-only">, Group<f_Group>;
def fobjc_gc : Flag<"-fobjc-gc">, Group<f_Group>;
def fobjc_legacy_dispatch : Flag<"-fobjc-legacy-dispatch">, Group<f_Group>;
Modified: cfe/branches/Apple/whitney/include/clang/Driver/ToolChain.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/include/clang/Driver/ToolChain.h?rev=122860&r1=122859&r2=122860&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/include/clang/Driver/ToolChain.h (original)
+++ cfe/branches/Apple/whitney/include/clang/Driver/ToolChain.h Tue Jan 4 20:20:03 2011
@@ -113,10 +113,6 @@
/// by default.
virtual bool IsIntegratedAssemblerDefault() const { return false; }
- /// IsObjCDefaultSynthPropertiesDefault - Does this tool chain enable
- /// -fobjc-default-synthesize-properties by default.
- virtual bool IsObjCDefaultSynthPropertiesDefault() const { return false; }
-
/// IsObjCNonFragileABIDefault - Does this tool chain set
/// -fobjc-nonfragile-abi by default.
virtual bool IsObjCNonFragileABIDefault() const { return false; }
Modified: cfe/branches/Apple/whitney/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Driver/ToolChains.h?rev=122860&r1=122859&r2=122860&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Driver/ToolChains.h (original)
+++ cfe/branches/Apple/whitney/lib/Driver/ToolChains.h Tue Jan 4 20:20:03 2011
@@ -176,11 +176,6 @@
getTriple().getArch() == llvm::Triple::x86_64);
#endif
}
-
- virtual bool IsObjCDefaultSynthPropertiesDefault() const {
- // Always allow default synthesized properties on Darwin.
- return true;
- }
virtual bool IsObjCNonFragileABIDefault() const {
// Non-fragile ABI is default for everything but i386.
Modified: cfe/branches/Apple/whitney/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Driver/Tools.cpp?rev=122860&r1=122859&r2=122860&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Driver/Tools.cpp Tue Jan 4 20:20:03 2011
@@ -1419,13 +1419,6 @@
CmdArgs.push_back("-fobjc-dispatch-method=non-legacy");
}
}
-
- // -fobjc-default-synthesize-properties=0 is default.
- if (Args.hasFlag(options::OPT_fobjc_default_synthesize_properties,
- options::OPT_fno_objc_default_synthesize_properties,
- getToolChain().IsObjCDefaultSynthPropertiesDefault())) {
- CmdArgs.push_back("-fobjc-default-synthesize-properties");
- }
}
if (!Args.hasFlag(options::OPT_fassume_sane_operator_new,
Modified: cfe/branches/Apple/whitney/test/Index/complete-synthesized.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/Index/complete-synthesized.m?rev=122860&r1=122859&r2=122860&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/Index/complete-synthesized.m (original)
+++ cfe/branches/Apple/whitney/test/Index/complete-synthesized.m Tue Jan 4 20:20:03 2011
@@ -35,20 +35,20 @@
}
@end
-// RUN: c-index-test -code-completion-at=%s:24:1 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC1 %s
+// RUN: c-index-test -code-completion-at=%s:24:1 -Xclang -fobjc-nonfragile-abi -Xclang -fobjc-default-synthesize-properties %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-abi %s | FileCheck -check-prefix=CHECK-CC2 %s
+// RUN: c-index-test -code-completion-at=%s:30:2 -Xclang -fobjc-nonfragile-abi -Xclang -fobjc-default-synthesize-properties %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-abi %s | FileCheck -check-prefix=CHECK-CC3 %s
+// RUN: c-index-test -code-completion-at=%s:34:2 -Xclang -fobjc-nonfragile-abi -Xclang -fobjc-default-synthesize-properties %s | FileCheck -check-prefix=CHECK-CC3 %s
// CHECK-CC3: NotImplemented:{TypedText _Bool} (50)
// CHECK-CC3: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
// CHECK-CC3: ObjCIvarDecl:{ResultType double}{TypedText prop4}
Modified: cfe/branches/Apple/whitney/test/SemaObjC/duplicate-ivar-in-class-extension.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/SemaObjC/duplicate-ivar-in-class-extension.m?rev=122860&r1=122859&r2=122860&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/SemaObjC/duplicate-ivar-in-class-extension.m (original)
+++ cfe/branches/Apple/whitney/test/SemaObjC/duplicate-ivar-in-class-extension.m Tue Jan 4 20:20:03 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
@interface Root @end
More information about the llvm-branch-commits
mailing list