2 files changed, 28 insertions, 1 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 49a470eace9..5e9a87c58a7 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -442,7 +442,7 @@ comments::FullComment *ASTContext::getCommentForDecl(
         if (comments::FullComment *FC = getCommentForDecl(Overridden[i], PP))
           return cloneFullComment(FC, D);
     }
-    else if (const TypedefDecl *TD = dyn_cast<TypedefDecl>(D)) {
+    else if (const TypedefNameDecl *TD = dyn_cast<TypedefNameDecl>(D)) {
       // Attach any tag type's documentation to its typedef if latter
       // does not have one of its own.
       QualType QT = TD->getUnderlyingType();
diff --git a/clang/test/Index/comment-cplus11-specific.cpp b/clang/test/Index/comment-cplus11-specific.cpp
new file mode 100644
index 00000000000..fa0db914cd7
--- /dev/null
+++ b/clang/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.])))] 
+}