From 09e0626d394bb32a89df2eab061614d64d29271b Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Sat, 7 Sep 2013 07:11:04 +0000
Subject: [PATCH] 'return' before 'else' is bad style
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190241 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/AST/ExprCXX.cpp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp
index d87c60a733b..78c724023e0 100644
--- a/lib/AST/ExprCXX.cpp
+++ b/lib/AST/ExprCXX.cpp
@@ -67,6 +67,7 @@ UuidAttr *CXXUuidofExpr::GetUuidAttrOfType(QualType QT,
if (!RD)
return 0;
+ // __uuidof can grab UUIDs from template arguments.
if (ClassTemplateSpecializationDecl *CTSD =
dyn_cast<ClassTemplateSpecializationDecl>(RD)) {
const TemplateArgumentList &TAL = CTSD->getTemplateArgs();
@@ -103,12 +104,13 @@ UuidAttr *CXXUuidofExpr::GetUuidAttrOfType(QualType QT,
}
return UuidForRD;
- } else
- for (CXXRecordDecl::redecl_iterator I = RD->redecls_begin(),
- E = RD->redecls_end();
- I != E; ++I)
- if (UuidAttr *Uuid = I->getAttr<UuidAttr>())
- return Uuid;
+ }
+
+ for (CXXRecordDecl::redecl_iterator I = RD->redecls_begin(),
+ E = RD->redecls_end();
+ I != E; ++I)
+ if (UuidAttr *Uuid = I->getAttr<UuidAttr>())
+ return Uuid;
return 0;
}
--
GitLab