From 13a8affbb87cdb869adabe2a6e5998559f2598c4 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 28 Aug 2010 15:42:30 +0000 Subject: [PATCH] simplify git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112372 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaTemplateInstantiateDecl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index e40075a45f..e9d642f679 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -1183,8 +1183,9 @@ Decl *TemplateDeclInstantiator::VisitFunctionDecl(FunctionDecl *D, else for (FunctionDecl::redecl_iterator R = Function->redecls_begin(), REnd = Function->redecls_end(); R != REnd; ++R) { - if (*R != Function && - ((*R)->getFriendObjectKind() != Decl::FOK_None)) { + if (*R == Function) + continue; + if ((*R)->getFriendObjectKind() != Decl::FOK_None) { if (const FunctionDecl *RPattern = (*R)->getTemplateInstantiationPattern()) if (RPattern->hasBody(RPattern)) { -- 2.50.1