4 files changed, 10 insertions, 8 deletions
diff --git a/clang/test/Analysis/NSString.m b/clang/test/Analysis/NSString.m
index a85a87aace0..a56c5b85852 100644
--- a/clang/test/Analysis/NSString.m
+++ b/clang/test/Analysis/NSString.m
@@ -99,15 +99,16 @@ NSComparisonResult f5(NSString* s, NSStringCompareOptions op, NSRange R) {
   return [s compare:aString options:op range:R locale:0]; // expected-warning {{Argument to 'NSString' method 'compare:options:range:locale:' cannot be nil.}}
 }
 
-NSComparisonResult f6(NSString* s) {
+NSArray *f6(NSString* s) {
   return [s componentsSeparatedByCharactersInSet:0]; // expected-warning {{Argument to 'NSString' method 'componentsSeparatedByCharactersInSet:' cannot be nil.}}
 }
 
 NSString* f7(NSString* s1, NSString* s2, NSString* s3) {
 
-  NSString* s4 = CFStringCreateWithFormat(kCFAllocatorDefault, 0,
-                                          L"%@ %@ (%@)", 
-                                          s1, s2, s3);
+  NSString* s4 = (NSString*)
+    CFStringCreateWithFormat(kCFAllocatorDefault, 0,
+                             (CFStringRef) __builtin___CFStringMakeConstantString("%@ %@ (%@)"), 
+                             s1, s2, s3);
 
   CFRetain(s4);
   return s4; // expected-warning{{leak}}
diff --git a/clang/test/Analysis/dead-stores.c b/clang/test/Analysis/dead-stores.c
index 0ca289231b9..6811ece1fe7 100644
--- a/clang/test/Analysis/dead-stores.c
+++ b/clang/test/Analysis/dead-stores.c
@@ -54,6 +54,7 @@ int f7(int *p) {
 }
 
 int f8(int *p) {
+  extern int *baz();
   if (p = baz()) // expected-warning{{Although the value}}
     return 1;
   return 0;
diff --git a/clang/test/Analysis/null-deref-ps.c b/clang/test/Analysis/null-deref-ps.c
index 57e4718fe69..6da44d0c73f 100644
--- a/clang/test/Analysis/null-deref-ps.c
+++ b/clang/test/Analysis/null-deref-ps.c
@@ -41,7 +41,7 @@ int f3_b(char* x) {
 
 int f4(int *p) {
   
-  uintptr_t x = p;
+  uintptr_t x = (uintptr_t) p;
   
   if (x)
     return 1;
diff --git a/clang/test/Sema/format-strings.c b/clang/test/Sema/format-strings.c
index c1e690a3b80..2d6e719e3ad 100644
--- a/clang/test/Sema/format-strings.c
+++ b/clang/test/Sema/format-strings.c
@@ -61,8 +61,8 @@ void check_wide_string(char* b, ...)
   va_list ap;
   va_start(ap,b);
 
-  printf(L"foo %d",2); // expected-warning {{should not be a wide string}}
-  vasprintf(&b,L"bar %d",ap); // expected-warning {{should not be a wide string}}
+  printf(L"foo %d",2); // expected-warning {{incompatible pointer types}}, expected-warning {{should not be a wide string}}
+  vasprintf(&b,L"bar %d",ap); // expected-warning {{incompatible pointer types}}, expected-warning {{should not be a wide string}}
 }
 
 void check_asterisk_precision_width(int x) {
@@ -71,4 +71,4 @@ void check_asterisk_precision_width(int x) {
   printf("%*d",12,x); // no-warning
   printf("%*d","foo",x); // expected-warning {{field width should have type 'int', but argument has type 'char *'}}
   printf("%.*d","foo",x); // expected-warning {{field precision should have type 'int', but argument has type 'char *'}}
-}
-\ No newline at end of file
+}