diff options
| -rw-r--r-- | docs/CommandGuide/clang.rst | 10 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticDriverKinds.td | 4 | ||||
| -rw-r--r-- | include/clang/Driver/CC1Options.td | 6 | ||||
| -rw-r--r-- | include/clang/Driver/Options.td | 4 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 19 | ||||
| -rw-r--r-- | test/Driver/darwin-objc-gc.m | 19 | ||||
| -rw-r--r-- | test/Misc/warning-flags.c | 3 |
7 files changed, 7 insertions, 58 deletions
diff --git a/docs/CommandGuide/clang.rst b/docs/CommandGuide/clang.rst index 8aade1a6ab..16bb09f3c7 100644 --- a/docs/CommandGuide/clang.rst +++ b/docs/CommandGuide/clang.rst @@ -167,16 +167,6 @@ Language Selection and Mode Options Enable the "Blocks" language feature. -.. option:: -fobjc-gc-only - - Indicate that Objective-C code should be compiled in GC-only mode, which only - works when Objective-C Garbage Collection is enabled. - -.. option:: -fobjc-gc - - Indicate that Objective-C code should be compiled in hybrid-GC mode, which - works with both GC and non-GC mode. - .. option:: -fobjc-abi-version=version Select the Objective-C ABI version to use. Available versions are 1 (legacy diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td index 0f35ff5dd1..2fcd3a5a2f 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.td +++ b/include/clang/Basic/DiagnosticDriverKinds.td @@ -137,8 +137,6 @@ def err_drv_preamble_format : Error< "incorrect format for -preamble-bytes=N,END">; def err_drv_conflicting_deployment_targets : Error< "conflicting deployment targets, both '%0' and '%1' are present in environment">; -def err_drv_objc_gc_arr : Error< - "cannot specify both '-fobjc-arc' and '%0'">; def err_arc_unsupported_on_runtime : Error< "-fobjc-arc is not supported on platforms using the legacy runtime">; def err_arc_unsupported_on_toolchain : Error< // feel free to generalize this @@ -211,8 +209,6 @@ def warn_drv_overriding_flag_option : Warning< def warn_drv_treating_input_as_cxx : Warning< "treating '%0' input as '%1' when in C++ mode, this behavior is deprecated">, InGroup<Deprecated>; -def warn_drv_objc_gc_unsupported : Warning< - "Objective-C garbage collection is not supported on this platform, ignoring '%0'">; def warn_drv_pch_not_first_include : Warning< "precompiled header '%0' was ignored because '%1' is not first '-include'">; def warn_missing_sysroot : Warning<"no such sysroot directory: '%0'">, diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index f203d7823c..5ebe083235 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -641,6 +641,12 @@ def fdefault_calling_conv_EQ : Joined<["-"], "fdefault-calling-conv=">, def finclude_default_header : Flag<["-"], "finclude-default-header">, HelpText<"Include the default header file for OpenCL">; +// FIXME: Remove these entirely once functionality/tests have been excised. +def fobjc_gc_only : Flag<["-"], "fobjc-gc-only">, Group<f_Group>, + HelpText<"Use GC exclusively for Objective-C related memory management">; +def fobjc_gc : Flag<["-"], "fobjc-gc">, Group<f_Group>, + HelpText<"Enable Objective-C garbage collection">; + //===----------------------------------------------------------------------===// // Header Search Options //===----------------------------------------------------------------------===// diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index bf4e83f7b2..f67c81a981 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -1092,10 +1092,6 @@ def : Flag<["-"], "faligned-new">, Alias<faligned_allocation>; def : Flag<["-"], "fno-aligned-new">, Alias<fno_aligned_allocation>; def faligned_new_EQ : Joined<["-"], "faligned-new=">; -def fobjc_gc_only : Flag<["-"], "fobjc-gc-only">, Group<f_Group>, Flags<[CC1Option]>, - HelpText<"Use GC exclusively for Objective-C related memory management">; -def fobjc_gc : Flag<["-"], "fobjc-gc">, Group<f_Group>, Flags<[CC1Option]>, - HelpText<"Enable Objective-C garbage collection">; def fobjc_legacy_dispatch : Flag<["-"], "fobjc-legacy-dispatch">, Group<f_Group>; def fobjc_new_property : Flag<["-"], "fobjc-new-property">, Group<clang_ignored_f_Group>; def fobjc_infer_related_result_type : Flag<["-"], "fobjc-infer-related-result-type">, diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index ff46cbd893..8a38fc8896 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -6005,31 +6005,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, if (rewriteKind != RK_None) CmdArgs.push_back("-fno-objc-infer-related-result-type"); - // Handle -fobjc-gc and -fobjc-gc-only. They are exclusive, and -fobjc-gc-only - // takes precedence. - const Arg *GCArg = Args.getLastArg(options::OPT_fobjc_gc_only); - if (!GCArg) - GCArg = Args.getLastArg(options::OPT_fobjc_gc); - if (GCArg) { - if (ARC) { - D.Diag(diag::err_drv_objc_gc_arr) << GCArg->getAsString(Args); - } else if (getToolChain().SupportsObjCGC()) { - GCArg->render(Args, CmdArgs); - } else { - // FIXME: We should move this to a hard error. - D.Diag(diag::warn_drv_objc_gc_unsupported) << GCArg->getAsString(Args); - } - } - // Pass down -fobjc-weak or -fno-objc-weak if present. if (types::isObjC(InputType)) { auto WeakArg = Args.getLastArg(options::OPT_fobjc_weak, options::OPT_fno_objc_weak); if (!WeakArg) { // nothing to do - } else if (GCArg) { - if (WeakArg->getOption().matches(options::OPT_fobjc_weak)) - D.Diag(diag::err_objc_weak_with_gc); } else if (!objcRuntime.allowsWeak()) { if (WeakArg->getOption().matches(options::OPT_fobjc_weak)) D.Diag(diag::err_objc_weak_unsupported); diff --git a/test/Driver/darwin-objc-gc.m b/test/Driver/darwin-objc-gc.m deleted file mode 100644 index aac6dc16c3..0000000000 --- a/test/Driver/darwin-objc-gc.m +++ /dev/null @@ -1,19 +0,0 @@ -// Check that we warn, but accept, -fobjc-gc for iPhone OS. - -// RUN: %clang -target i386-apple-darwin9 -miphoneos-version-min=3.0 -stdlib=platform -fobjc-gc -flto -S -o %t %s 2> %t.err -// RUN: FileCheck --check-prefix=IPHONE_OBJC_GC_LL %s < %t -// RUN: FileCheck --check-prefix=IPHONE_OBJC_GC_STDERR %s < %t.err - -// IPHONE_OBJC_GC_LL: define void @f0 -// IPHONE_OBJC_GC_LL-NOT: objc_assign_ivar -// IPHONE_OBJC_GC_LL: } - -// IPHONE_OBJC_GC_STDERR: warning: Objective-C garbage collection is not supported on this platform, ignoring '-fobjc-gc' - -@interface A { -@public - id x; -} -@end - -void f0(A *a, id x) { a->x = x; } diff --git a/test/Misc/warning-flags.c b/test/Misc/warning-flags.c index 08edb6f5bc..1a33265e4c 100644 --- a/test/Misc/warning-flags.c +++ b/test/Misc/warning-flags.c @@ -18,7 +18,7 @@ This test serves two purposes: The list of warnings below should NEVER grow. It should gradually shrink to 0. -CHECK: Warnings without flags (80): +CHECK: Warnings without flags (79): CHECK-NEXT: ext_excess_initializers CHECK-NEXT: ext_excess_initializers_in_char_array_initializer CHECK-NEXT: ext_expected_semi_decl_list @@ -54,7 +54,6 @@ CHECK-NEXT: warn_delete_array_type CHECK-NEXT: warn_double_const_requires_fp64 CHECK-NEXT: warn_drv_assuming_mfloat_abi_is CHECK-NEXT: warn_drv_clang_unsupported -CHECK-NEXT: warn_drv_objc_gc_unsupported CHECK-NEXT: warn_drv_pch_not_first_include CHECK-NEXT: warn_dup_category_def CHECK-NEXT: warn_enum_value_overflow |