X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FObjCARC%2FObjCARCOpts.cpp;h=ba6c04e514c2d27c9fff9140ce7f3522e205e4e0;hb=9739b65264f67fd9f42ae53b0cca886e94ff238c;hp=5646e5285a2f7941986c6e46c876b765ccc1e881;hpb=d58f773b96fdb5539d9da2192b8cf2ff6112239f;p=oota-llvm.git

diff --git a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
index 5646e5285a2..ba6c04e514c 100644
--- a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
+++ b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
@@ -713,9 +713,9 @@ EnableARCAnnotations("enable-objc-arc-annotations", cl::init(false),
                      cl::desc("Enable emission of arc data flow analysis "
                               "annotations"));
 static cl::opt<bool>
-EnableCheckForCFGHazards("enable-objc-arc-checkforcfghazards", cl::init(true),
-                         cl::desc("Disable check for cfg hazards when "
-                                  "annotating"));
+DisableCheckForCFGHazards("disable-objc-arc-checkforcfghazards", cl::init(false),
+                          cl::desc("Disable check for cfg hazards when "
+                                   "annotating"));
 
 /// This function appends a unique ARCAnnotationProvenanceSourceMDKind id to an
 /// instruction so that we can track backwards when post processing via the llvm
@@ -2177,7 +2177,7 @@ ObjCARCOpt::VisitTopDown(BasicBlock *BB,
   ANNOTATE_TOPDOWN_BBEND(MyStates, BB);
 
 #ifdef ARC_ANNOTATIONS
-  if (EnableARCAnnotations && EnableCheckForCFGHazards)
+  if (!(EnableARCAnnotations && DisableCheckForCFGHazards))
 #endif
   CheckForCFGHazards(BB, BBStates, MyStates);
   return NestingDetected;