Fully reverting r203236 -- it seems the only bots that are happy are the MSVC bots.

llvm-svn: 203237
This commit is contained in:
Aaron Ballman
2014-03-07 13:13:38 +00:00
parent 690829696c
commit 7dce1a840c
13 changed files with 79 additions and 69 deletions

View File

@@ -2638,11 +2638,12 @@ CodeCompletionResult::CreateCodeCompletionString(ASTContext &Ctx,
return Result.TakeString();
}
for (auto i = ND->specific_attr_begin<AnnotateAttr>(),
e = ND->specific_attr_end<AnnotateAttr>(); i != e; ++i)
Result.AddAnnotation(
Result.getAllocator().CopyString((*i)->getAnnotation()));
for (Decl::attr_iterator i = ND->attr_begin(); i != ND->attr_end(); ++i) {
if (AnnotateAttr *Attr = dyn_cast_or_null<AnnotateAttr>(*i)) {
Result.AddAnnotation(Result.getAllocator().CopyString(Attr->getAnnotation()));
}
}
AddResultTypeChunk(Ctx, Policy, ND, Result);
if (const FunctionDecl *Function = dyn_cast<FunctionDecl>(ND)) {