Revert r184249, "doc. parsing: Allow parameter name "..." for variadic functions...

It crashes in the case;

/// Without any "param"s in the description.
int printf(const char *format, ...);

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

diff --git a/include/clang/AST/CommentSema.h b/include/clang/AST/CommentSema.h
index 490b88c1bb1d62fd65a58bc4669c1317ef4bdfef..15e454dcc389ba2ad678cf6786404a14bf2ba7bf 100644 (file)
--- a/include/clang/AST/CommentSema.h
+++ b/include/clang/AST/CommentSema.h
@@ -220,7 +220,6 @@ public:
   bool isUnionDecl();
   bool isObjCInterfaceDecl();
   bool isObjCProtocolDecl();
-  bool isFunctionOrMethodVariadic();
 
   ArrayRef<const ParmVarDecl *> getParamVars();
 

diff --git a/lib/AST/CommentSema.cpp b/lib/AST/CommentSema.cpp
index e6a5b85ed66630ce7b2e60d1b5daddcd4bfd3b2a..c242eb0f6067b70bb584e0acc184f22b62a7973f 100644 (file)
--- a/lib/AST/CommentSema.cpp
+++ b/lib/AST/CommentSema.cpp
@@ -720,7 +720,7 @@ void Sema::resolveParamCommandIndexes(const FullComment *FC) {
   SmallVector<ParamCommandComment *, 8> ParamVarDocs;
 
   ArrayRef<const ParmVarDecl *> ParamVars = getParamVars();
-  ParamVarDocs.resize(ParamVars.size() + isFunctionOrMethodVariadic(), NULL);
+  ParamVarDocs.resize(ParamVars.size(), NULL);
 
   // First pass over all \\param commands: resolve all parameter names.
   for (Comment::child_iterator I = FC->child_begin(), E = FC->child_end();
@@ -808,18 +808,6 @@ bool Sema::isObjCMethodDecl() {
   return isFunctionDecl() && ThisDeclInfo->CurrentDecl &&
          isa<ObjCMethodDecl>(ThisDeclInfo->CurrentDecl);
 }
-
-bool Sema::isFunctionOrMethodVariadic() {
-  if (!isAnyFunctionDecl() && !isObjCMethodDecl())
-    return false;
-  if (const FunctionDecl *FD = 
-        dyn_cast<FunctionDecl>(ThisDeclInfo->CurrentDecl))
-    return FD->isVariadic();
-  if (const ObjCMethodDecl *MD = 
-        dyn_cast<ObjCMethodDecl>(ThisDeclInfo->CurrentDecl))
-    return MD->isVariadic();
-  return false;
-}
   
 /// isFunctionPointerVarDecl - returns 'true' if declaration is a pointer to
 /// function decl.
@@ -918,8 +906,6 @@ unsigned Sema::resolveParmVarReference(StringRef Name,
     if (II && II->getName() == Name)
       return i;
   }
-  if (Name == "..." && isFunctionOrMethodVariadic())
-    return ParamVars.size();
   return ParamCommandComment::InvalidParamIndex;
 }
 

diff --git a/test/Sema/warn-documentation.m b/test/Sema/warn-documentation.m
index e348dba3e0c37b5adc9fa0eff39ca9baa6dbcc41..17dd92e6eba48f77ee6d76eb1e341becdbbf5114 100644 (file)
--- a/test/Sema/warn-documentation.m
+++ b/test/Sema/warn-documentation.m
@@ -215,22 +215,3 @@ int FooBar();
 /// \brief comment
 -(void)meth {}
 @end
-
-// rdar://14124644
-@interface rdar14124644
-/// @param[in] arg somthing
-/// @param[in] ... This is vararg
-- (void) VarArgMeth : (id)arg, ...;
-@end
-
-@implementation rdar14124644
-/// @param[in] arg somthing
-/// @param[in] ... This is vararg
-- (void) VarArgMeth : (id)arg, ... {}
-@end
-
-/// @param[in] format somthing
-/// @param[in] ...
-///     Variable arguments that are needed for the printf style
-///     format string \a format.
-int printf(const char* format, ...);