diff options
| author | Yaxun Liu <Yaxun.Liu@amd.com> | 2017-07-08 19:13:41 +0000 |
|---|---|---|
| committer | Yaxun Liu <Yaxun.Liu@amd.com> | 2017-07-08 19:13:41 +0000 |
| commit | c0ed38db22c34bc8dfed1cf46ae5713f12aff673 (patch) | |
| tree | d1d56007016739c3badd7aa5cd0129dc4d289278 /lib/CodeGen/CodeGenModule.cpp | |
| parent | 609e5597294ea440f9a10102e7f1c2a00aec8687 (diff) | |
Fix build failure with gcc about mixing enum and non-enum
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@307483 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 3a30ddc667..4b15b8ac4c 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -2432,7 +2432,8 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, auto ExpectedAS = D ? D->getType().getAddressSpace() - : (LangOpts.OpenCL ? LangAS::opencl_global : LangAS::Default); + : static_cast<unsigned>(LangOpts.OpenCL ? LangAS::opencl_global + : LangAS::Default); assert(getContext().getTargetAddressSpace(ExpectedAS) == Ty->getPointerAddressSpace()); if (AddrSpace != ExpectedAS) @@ -2574,7 +2575,8 @@ CharUnits CodeGenModule::GetTargetTypeStoreSize(llvm::Type *Ty) const { unsigned CodeGenModule::GetGlobalVarAddressSpace(const VarDecl *D) { unsigned AddrSpace; if (LangOpts.OpenCL) { - AddrSpace = D ? D->getType().getAddressSpace() : LangAS::opencl_global; + AddrSpace = D ? D->getType().getAddressSpace() + : static_cast<unsigned>(LangAS::opencl_global); assert(AddrSpace == LangAS::opencl_global || AddrSpace == LangAS::opencl_constant || AddrSpace == LangAS::opencl_local || |