From be8f522ef3df6aec5d4c9c2e897865e55bbdb6ff Mon Sep 17 00:00:00 2001
From: Akira Hatanaka <ahatanaka@apple.com>
Date: Thu, 25 Feb 2016 07:08:33 +0000
Subject: [PATCH] [Sema] Remove assert in
 TreeTransform<Derived>::TransformObjCObjectType.

The assert isn't correct since TypeLoc::ObjCObjectTypeLoc doesn't
indicate whether the type is a dependent type. The function returns
false for a type like "<SomeProtocol>" which is a synonym for
"id<SomeProtocol>".

rdar://problem/23838912

Differential Revision: http://reviews.llvm.org/D17355

llvm-svn: 261829
---
 clang/lib/Sema/TreeTransform.h                | 1 -
 clang/test/SemaObjCXX/base-type-as-written.mm | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 clang/test/SemaObjCXX/base-type-as-written.mm

diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 624839cc944e..627165fa2c79 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -5932,7 +5932,6 @@ TreeTransform<Derived>::TransformObjCObjectType(TypeLocBuilder &TLB,
   }
 
   ObjCObjectTypeLoc NewT = TLB.push<ObjCObjectTypeLoc>(Result);
-  assert(TL.hasBaseTypeAsWritten() && "Can't be dependent");
   NewT.setHasBaseTypeAsWritten(true);
   NewT.setTypeArgsLAngleLoc(TL.getTypeArgsLAngleLoc());
   for (unsigned i = 0, n = TL.getNumTypeArgs(); i != n; ++i)
diff --git a/clang/test/SemaObjCXX/base-type-as-written.mm b/clang/test/SemaObjCXX/base-type-as-written.mm
new file mode 100644
index 000000000000..05962e3f288c
--- /dev/null
+++ b/clang/test/SemaObjCXX/base-type-as-written.mm
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// Make sure we don't crash in TreeTransform<Derived>::TransformObjCObjectType.
+
+@protocol P1
+@end
+
+template <class T1><P1> foo1(T1) { // expected-warning {{protocol has no object type specified; defaults to qualified 'id'}}
+  foo1(0);
+}