1 files changed, 9 insertions, 0 deletions
diff --git a/clang/test/SemaCXX/base-class-ambiguity-check.cpp b/clang/test/SemaCXX/base-class-ambiguity-check.cpp
new file mode 100644
index 00000000000..fc1c4c2cea5
--- /dev/null
+++ b/clang/test/SemaCXX/base-class-ambiguity-check.cpp
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
+
+template <typename T> class Foo {
+  struct Base : T {};
+
+  // Test that this code no longer causes a crash in Sema. rdar://23291875
+  struct Derived : Base, T {};
+};