From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Tue, 26 Jun 2018 15:20:20 +0000 (+0000)
Subject: Avoid spurious 'comma operator within array index expression' MSVC warning. NFCI.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df4e40a91cabc39da987aa5fe5f9b7c3049554b6;p=clang

Avoid spurious 'comma operator within array index expression' MSVC warning. NFCI.

Split the braces list initialization from the [] map operator to keep MSVC happy.

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

diff --git a/lib/AST/ItaniumCXXABI.cpp b/lib/AST/ItaniumCXXABI.cpp
index 2403e048da..a75ae14f90 100644
--- a/lib/AST/ItaniumCXXABI.cpp
+++ b/lib/AST/ItaniumCXXABI.cpp
@@ -135,9 +135,10 @@ public:
 
   /// Variable decls are numbered by identifier.
   unsigned getManglingNumber(const VarDecl *VD, unsigned) override {
-    if (auto *DD = dyn_cast<DecompositionDecl>(VD))
-      return ++DecompsitionDeclManglingNumbers[
-          DecompositionDeclName{DD->bindings()}];
+    if (auto *DD = dyn_cast<DecompositionDecl>(VD)) {
+      DecompositionDeclName Name{DD->bindings()};
+      return ++DecompsitionDeclManglingNumbers[Name];
+    }
 
     const IdentifierInfo *Identifier = VD->getIdentifier();
     if (!Identifier) {