From d2a3f4765b19254a705e4a8c7bee4af0f5a120f7 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Mon, 6 Oct 2014 12:42:31 +0000
Subject: Using an explicit cast to work around MSVC 2013 not picking the
 conversion operator as expected. NFC, should fix the MSVC build bots.

llvm-svn: 219116
---
 clang/lib/CodeGen/CGDebugInfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clang/lib/CodeGen/CGDebugInfo.cpp')

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 8e2d0de6ecd..025bdfaed0e 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1178,7 +1178,7 @@ CollectCXXMemberFunctions(const CXXRecordDecl *RD, llvm::DIFile Unit,
     auto MI = SPCache.find(Method->getCanonicalDecl());
     EltTys.push_back(MI == SPCache.end()
                          ? CreateCXXMemberFunction(Method, Unit, RecordTy)
-                         : MI->second);
+                         : static_cast<llvm::Value *>(MI->second));
   }
 }
 
-- 
cgit v1.2.3