4 files changed, 6 insertions, 4 deletions

diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h
index 8f60b47f4cd..1dab6154292 100644
--- a/clang/include/clang/Basic/LangOptions.h
+++ b/clang/include/clang/Basic/LangOptions.h
@@ -147,7 +147,7 @@ public:
 
     OverflowChecking = 0;
     ObjCGCBitmapPrint = 0;
-    ObjCNewGCAPI = 0;
+    ObjCNewGCAPI = 1;
 
     InstantiationDepth = 99;
 
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast-3.m b/clang/test/CodeGenObjC/objc2-ivar-assign.m
index 1b5a58cf188..cfdf87f2f12 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast-3.m
+++ b/clang/test/CodeGenObjC/objc2-ivar-assign.m
@@ -1,5 +1,5 @@
 // RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s &&
-// RUN: grep objc_assign_strongCast %t | count 6 &&
+// RUN: grep objc_assign_ivar %t | count 6 &&
 // RUN: true
 
 @interface I @end
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast-4.m b/clang/test/CodeGenObjC/objc2-write-barrier-3.m
index 6603e324657..2fb416b79b2 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast-4.m
+++ b/clang/test/CodeGenObjC/objc2-write-barrier-3.m
@@ -1,5 +1,6 @@
 // RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s &&
-// RUN: grep objc_assign_strongCast %t | count 8 &&
+// RUN: grep objc_assign_ivar %t | count 3 &&
+// RUN: grep objc_assign_strongCast %t | count 6 &&
 // RUN: true
 
 struct Slice {
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast-2.m b/clang/test/CodeGenObjC/objc2-write-barrier-4.m
index c4bff4b1bc0..f96a233787b 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast-2.m
+++ b/clang/test/CodeGenObjC/objc2-write-barrier-4.m
@@ -1,5 +1,6 @@
 // RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s &&
-// RUN: grep objc_assign_strongCast %t | count 4 &&
+// RUN: grep objc_assign_global %t | count 3 &&
+// RUN: grep objc_assign_strongCast %t | count 2 &&
 // RUN: true
 
 @interface A