[doc parsing] use getParamName to access parameter

for current(rewritten) comment and getParamNameAsWritten
to access param name coming with \param marker.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166231 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 11 insertions, 13 deletions

diff --git a/lib/AST/Comment.cpp b/lib/AST/Comment.cpp
index 03b58a7aa3..edb0f60fdf 100644
--- a/lib/AST/Comment.cpp
+++ b/lib/AST/Comment.cpp
@@ -306,24 +306,22 @@ void DeclInfo::fill() {
 }
 
 StringRef ParamCommandComment::getParamName(comments::FullComment *FC) const {
-  if (FC && isParamIndexValid())
-    return FC->getThisDeclInfo()->ParamVars[getParamIndex()]->getName();
-  return Args[0].Text;
+  assert(isParamIndexValid());
+  return FC->getThisDeclInfo()->ParamVars[getParamIndex()]->getName();
 }
 
 StringRef TParamCommandComment::getParamName(comments::FullComment *FC) const {
-  if (FC && isPositionValid()) {
-    const TemplateParameterList *TPL = FC->getThisDeclInfo()->TemplateParameters;
-    for (unsigned i = 0, e = getDepth(); i != e; ++i) {
-      if (i == e-1)
-        return TPL->getParam(getIndex(i))->getName();
-      const NamedDecl *Param = TPL->getParam(getIndex(i));
-      if (const TemplateTemplateParmDecl *TTP =
+  assert(isPositionValid());
+  const TemplateParameterList *TPL = FC->getThisDeclInfo()->TemplateParameters;
+  for (unsigned i = 0, e = getDepth(); i != e; ++i) {
+    if (i == e-1)
+      return TPL->getParam(getIndex(i))->getName();
+    const NamedDecl *Param = TPL->getParam(getIndex(i));
+    if (const TemplateTemplateParmDecl *TTP =
           dyn_cast<TemplateTemplateParmDecl>(Param))
-        TPL = TTP->getTemplateParameters();
-    }
+      TPL = TTP->getTemplateParameters();
   }
-  return Args[0].Text;
+  return "";
 }
   
 } // end namespace comments