diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-01-27 11:09:41 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-01-27 11:09:41 +0000 |
| commit | 06b5ea65365c5898be8355868a49c6f396cc8b02 (patch) | |
| tree | 203766529c9494feab0eb0529300bfc4da891d1a | |
| parent | b263bdf2954953cc7cca5d667eb01319ea0f72ec (diff) | |
Revert r173586 (and r173587) , "Attach any tag type's documentation to its typedef if"
It caused unexpected warnings with @tparam.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173614 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AST/ASTContext.cpp | 8 | ||||
| -rw-r--r-- | test/Index/annotate-comments-typedef.m | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 1539b00939..7ba64e32f3 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -428,12 +428,12 @@ comments::FullComment *ASTContext::getCommentForDecl( return cloneFullComment(FC, D); } else if (const TypedefDecl *TD = dyn_cast<TypedefDecl>(D)) { - // Attach any tag type's documentation to its typedef if latter + // Attach enum's documentation to its typedef if latter // does not have one of its own. QualType QT = TD->getUnderlyingType(); - if (const TagType *TT = QT->getAs<TagType>()) - if (const Decl *TD = TT->getDecl()) - if (comments::FullComment *FC = getCommentForDecl(TD, PP)) + if (const EnumType *ET = QT->getAs<EnumType>()) + if (const EnumDecl *ED = ET->getDecl()) + if (comments::FullComment *FC = getCommentForDecl(ED, PP)) return cloneFullComment(FC, D); } return NULL; diff --git a/test/Index/annotate-comments-typedef.m b/test/Index/annotate-comments-typedef.m index 784c51ec8c..6e5fb73520 100644 --- a/test/Index/annotate-comments-typedef.m +++ b/test/Index/annotate-comments-typedef.m @@ -28,9 +28,3 @@ enum E { }; typedef enum E E_T; // CHECK: TypedefDecl=E_T:[[@LINE-1]]:16 (Definition) FullCommentAsHTML=[<p class="para-brief"> Documentation for E </p>] FullCommentAsXML=[<Typedef file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-1]]" column="16"><Name>E</Name><USR>c:@E@E</USR><Declaration>typedef enum E E_T</Declaration><Abstract><Para> Documentation for E </Para></Abstract></Typedef>] - -/** Comment about Foo */ -typedef struct { - int iii; - } Foo; -// CHECK: TypedefDecl=Foo:[[@LINE-1]]:11 (Definition) FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Typedef file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-1]]" column="11"><Name><anonymous></Name><USR>c:@SA@Foo</USR><Declaration>typedef struct Foo Foo</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Typedef>] |