'return' before 'else' is bad style

llvm-svn: 190241

1 files changed, 8 insertions, 6 deletions

diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp
index d87c60a733b..78c724023e0 100644
--- a/clang/lib/AST/ExprCXX.cpp
+++ b/clang/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;
 }