From 7bce64242fda71a8a32088e59625313b7cec89c0 Mon Sep 17 00:00:00 2001 From: Yaxun Liu Date: Sat, 8 Jul 2017 19:13:41 +0000 Subject: Fix build failure with gcc about mixing enum and non-enum llvm-svn: 307483 --- clang/lib/CodeGen/CodeGenModule.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 3a30ddc6675..4b15b8ac4c7 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/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(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(LangAS::opencl_global); assert(AddrSpace == LangAS::opencl_global || AddrSpace == LangAS::opencl_constant || AddrSpace == LangAS::opencl_local || -- cgit v1.2.3