Vendor import of clang trunk r126079:

http://llvm.org/svn/llvm-project/cfe/trunk@126079

4 files changed, 18 insertions, 2 deletions

diff --git a/test/Coverage/c-language-features.inc b/test/Coverage/c-language-features.inc
index 3548132..0ff1237 100644
--- a/test/Coverage/c-language-features.inc
+++ b/test/Coverage/c-language-features.inc
@@ -188,3 +188,11 @@ void f10() {
 
   x = (struct f10_s0) { .iv0 = "name" };
 }
+
+// Nested structures.
+struct s11 {
+  struct s11_2 {
+    int f0;
+  } f0;
+  int f1;
+};
diff --git a/test/Coverage/cxx-language-features.inc b/test/Coverage/cxx-language-features.inc
index 51c1104..31b50be 100644
--- a/test/Coverage/cxx-language-features.inc
+++ b/test/Coverage/cxx-language-features.inc
@@ -19,3 +19,9 @@ class Base1 {
 class Base2 { };
 
 class Derived1 : Base1, virtual public Base2 { };
+
+/* Template classes, template functions */
+enum E1 { EC1 };
+template <E1 v> class C1 {};
+template <E1 v> C1<v> f1() { return C1<v>(); }
+void f2() { f1<EC1>(); }
diff --git a/test/Coverage/html-diagnostics.c b/test/Coverage/html-diagnostics.c
index 81b2cfa..be820fb 100644
--- a/test/Coverage/html-diagnostics.c
+++ b/test/Coverage/html-diagnostics.c
@@ -3,7 +3,10 @@
 // RUN: cat %t/*.html | FileCheck %s
 
 // CHECK: <h3>Annotated Source Code</h3>
-// CHECK: Dereference of null pointer
+
+// Without tweaking expr, the expr would hit to the line below
+// emitted to the output as comment.
+// CHECK: {{[D]ereference of null pointer}}
 
 void f0(int x) {
   int *p = &x;
diff --git a/test/Coverage/targets.c b/test/Coverage/targets.c
index c9f6f8d..d2a1112 100644
--- a/test/Coverage/targets.c
+++ b/test/Coverage/targets.c
@@ -6,7 +6,6 @@
 // RUN: %clang_cc1 -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s
 // RUN: %clang_cc1 -g -triple i686-unknown-unknown -emit-llvm -o %t %s
 // RUN: %clang_cc1 -g -triple i686-unknown-win32 -emit-llvm -o %t %s
-// RUN: %clang_cc1 -g -triple pic16-unknown-unknown -emit-llvm -o %t %s
 // RUN: %clang_cc1 -g -triple powerpc-apple-darwin9 -emit-llvm -o %t %s
 // RUN: %clang_cc1 -g -triple powerpc-unknown-unknown -emit-llvm -o %t %s
 // RUN: %clang_cc1 -g -triple powerpc64-apple-darwin9 -emit-llvm -o %t %s