Rename -cc1 option '-warn-objc-unused-ivars' to '-analyzer-check-objc-unused-ivars'.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95345 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td
index fa291a50b1da860f8177bc3e4c2c0dbc974da2b5..1d0390aaff908ff9189d8f19ca6cfde6bee685d4 100644 (file)
--- a/include/clang/Driver/CC1Options.td
+++ b/include/clang/Driver/CC1Options.td
@@ -48,7 +48,7 @@ def analysis_WarnObjCMethSigs : Flag<"-warn-objc-methodsigs">,
   HelpText<"Warn about Objective-C method signatures with type incompatibilities">;
 def analysis_WarnObjCDealloc : Flag<"-warn-objc-missing-dealloc">,
   HelpText<"Warn about Objective-C classes that lack a correct implementation of -dealloc">;
-def analysis_WarnObjCUnusedIvars : Flag<"-warn-objc-unused-ivars">,
+def analysis_WarnObjCUnusedIvars : Flag<"-analyzer-check-objc-unused-ivars">,
   HelpText<"Warn about private ivars that are never used">;
 def analysis_CheckerCFRef : Flag<"-checker-cfref">,
   HelpText<"Run the [Core] Foundation reference count checker">;

diff --git a/include/clang/Frontend/Analyses.def b/include/clang/Frontend/Analyses.def
index 0bf603dfc8a8f37db615b2f975868171e118501e..d57b2267a365ce9bd1255bac85c2963510d3d237 100644 (file)
--- a/include/clang/Frontend/Analyses.def
+++ b/include/clang/Frontend/Analyses.def
@@ -42,7 +42,7 @@ ANALYSIS(WarnObjCDealloc, "warn-objc-missing-dealloc",
  "Warn about Objective-C classes that lack a correct implementation of -dealloc",
  ObjCImplementation)
  
-ANALYSIS(WarnObjCUnusedIvars, "warn-objc-unused-ivars",
+ANALYSIS(WarnObjCUnusedIvars, "analyzer-check-objc-unused-ivars",
   "Warn about private ivars that are never used", ObjCImplementation)
 
 ANALYSIS(CheckerCFRef, "checker-cfref",

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index be69854e0b9f7e2c7affa2c66770ec4e2f5f58ea..3ee4552e73e0c364b0d51a21ed1c52601c707a76 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -708,7 +708,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-warn-objc-methodsigs");
       // Do not enable the missing -dealloc check.
       // '-warn-objc-missing-dealloc',
-      CmdArgs.push_back("-warn-objc-unused-ivars");
+      CmdArgs.push_back("-analyzer-check-objc-unused-ivars");
     }
 
     // Set the output format. The default is plist, for (lame) historical

diff --git a/test/Analysis/unused-ivars.m b/test/Analysis/unused-ivars.m
index 2ad886fdb3a121745ea1ce46c2ec7d346fe4ab07..600f0e28e0364a30f06ccb42b4300db1f8f6e0d4 100644 (file)
--- a/test/Analysis/unused-ivars.m
+++ b/test/Analysis/unused-ivars.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fblocks -analyze -warn-objc-unused-ivars %s -verify
+// RUN: %clang_cc1 -fblocks -analyze -analyzer-check-objc-unused-ivars %s -verify
 
 //===--- BEGIN: Delta-debugging reduced headers. --------------------------===//
 

diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index ae9db291f099a4db276c1d1758081fdc17286394..044feeae4d0816d99de407cb494602fdef32d4bc 100755 (executable)
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -126,7 +126,7 @@ my %AnalysesDefaultEnabled = (
   '-warn-objc-methodsigs' => 1,
   # Do not enable the missing -dealloc check by default.
   #  '-warn-objc-missing-dealloc' => 1,
-  '-warn-objc-unused-ivars' => 1,
+  '-analyzer-check-objc-unused-ivars' => 1,
   '-analyzer-check-security-syntactic' => 1
 );