Merge commit '20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8'

Conflicts:
	lib/CodeGen/ItaniumCXXABI.cpp

1 files changed, 27 insertions, 0 deletions

diff --git a/test/Index/comment-cplus11-specific.cpp b/test/Index/comment-cplus11-specific.cpp
new file mode 100644
index 0000000000..fa0db914cd
--- /dev/null
+++ b/test/Index/comment-cplus11-specific.cpp
@@ -0,0 +1,27 @@
+// RUN: rm -rf %t
+// RUN: mkdir %t
+// RUN: c-index-test -test-load-source all -comments-xml-schema=%S/../../bindings/xml/comment-xml-schema.rng std=c++11 %s > %t/out
+// RUN: FileCheck %s < %t/out
+// rdar://13752382
+
+namespace inner {
+  //! This documentation should be inherited.
+  struct Opaque;
+}
+// CHECK:         (CXComment_Text Text=[ This documentation should be inherited.])))] 
+
+namespace borrow {
+  //! This is documentation for the typedef (which shows up).
+  typedef inner::Opaque Typedef;
+// CHECK:         (CXComment_Text Text=[ This is documentation for the typedef (which shows up).])))] 
+
+  //! This is documentation for the alias (which shows up).
+  using Alias = inner::Opaque;
+// CHECK:         (CXComment_Text Text=[ This is documentation for the alias (which shows up).])))] 
+
+  typedef inner::Opaque NoDocTypedef;
+// CHECK:         (CXComment_Text Text=[ This documentation should be inherited.])))] 
+
+  using NoDocAlias = inner::Opaque;
+// CHECK:         (CXComment_Text Text=[ This documentation should be inherited.])))] 
+}