Update clang to r86025.

3 files changed, 16 insertions, 4 deletions

diff --git a/test/CodeGenObjC/PR4894-recursive-debug-crash.m b/test/CodeGenObjC/PR4894-recursive-debug-crash.m
index c5f901c..d737911 100644
--- a/test/CodeGenObjC/PR4894-recursive-debug-crash.m
+++ b/test/CodeGenObjC/PR4894-recursive-debug-crash.m
@@ -3,7 +3,7 @@
 //
 // This test is actually just making sure we can generate the debug info for the
 // return type from im0 without crashing.
-// XFAIL
+// XFAIL: *
 
 @interface I0 {
   I0 *_iv0;
diff --git a/test/CodeGenObjC/encode-test-2.m b/test/CodeGenObjC/encode-test-2.m
index 6901168..07a5336 100644
--- a/test/CodeGenObjC/encode-test-2.m
+++ b/test/CodeGenObjC/encode-test-2.m
@@ -3,7 +3,7 @@
 // RUN: grep -e "@\\\22<X><Y>\\\22" %t  &&
 // RUN: grep -e "@\\\22<X><Y><Z>\\\22" %t  &&
 // RUN: grep -e "@\\\22Foo<X><Y><Z>\\\22" %t  &&
-// RUN: grep -e "{Intf=@@@@}" %t  
+// RUN: grep -e "{Intf=@@@@#}" %t  
 
 @protocol X, Y, Z;
 @class Foo;
@@ -17,6 +17,7 @@ id <X> IVAR_x;
 id <X, Y> IVAR_xy;
 id <X, Y, Z> IVAR_xyz;
 Foo <X, Y, Z> *IVAR_Fooxyz;
+Class <X> IVAR_Classx;
 }
 @end
 
diff --git a/test/CodeGenObjC/synthesize_ivar.m b/test/CodeGenObjC/synthesize_ivar.m
index 7646f70..e1746f1 100644
--- a/test/CodeGenObjC/synthesize_ivar.m
+++ b/test/CodeGenObjC/synthesize_ivar.m
@@ -1,8 +1,6 @@
 // RUN: clang-cc -triple x86_64-apple-darwin10 -emit-llvm -o %t %s
 
 @interface I
-{
-}
 @property int IP;
 @end
 
@@ -25,3 +23,16 @@
 @implementation OrganizerViolatorView
 @synthesize bindingInfo;
 @end
+
+// <rdar://problem/7336352> [irgen] crash in synthesized property construction
+
+@interface I0 @end
+@protocol P0 @end
+@interface I1 {
+  I0<P0> *iv0;
+}
+@property (assign, readwrite) id p0;
+@end
+@implementation I1
+@synthesize p0 = iv0;
+@end