From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Thu, 20 Feb 2014 09:16:23 +0000 (+0000)
Subject: COFFObjectFile.cpp: Appease msvc in r201760.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a40c8a4380f79212ee4d16c34d74345addd380f3;p=oota-llvm.git

COFFObjectFile.cpp: Appease msvc in r201760.

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

diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp
index 85b2f0b91d7..ede784379f2 100644
--- a/lib/Object/COFFObjectFile.cpp
+++ b/lib/Object/COFFObjectFile.cpp
@@ -383,7 +383,7 @@ error_code COFFObjectFile::initSymbolTablePtr() {
 
 // Returns the file offset for the given VA.
 error_code COFFObjectFile::getVaPtr(uint32_t Addr, uintptr_t &Res) const {
-  uint32_t ImageBase = PE32Header ? PE32Header->ImageBase : PE32PlusHeader->ImageBase;
+  uint32_t ImageBase = PE32Header ? PE32Header->ImageBase : (uint32_t)PE32PlusHeader->ImageBase;
   return getRvaPtr(Addr - ImageBase, Res);
 }