diff options
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenPGO.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 73c4bae7dbd..0a49ea5a5e9 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -1298,7 +1298,7 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) { Value *Src = Visit(const_cast<Expr*>(E)); llvm::Type *SrcTy = Src->getType(); llvm::Type *DstTy = ConvertType(DestTy); - if (SrcTy->isPtrOrPtrVectorTy() && DstTy->isPtrOrPtrVectorTy() && + if (SrcTy->isPtrOrPtrVectorTy() && DstTy->isPtrOrPtrVectorTy() && SrcTy->getPointerAddressSpace() != DstTy->getPointerAddressSpace()) { llvm::Type *MidTy = CGF.CGM.getDataLayout().getIntPtrType(SrcTy); return Builder.CreateIntToPtr(Builder.CreatePtrToInt(Src, MidTy), DstTy); diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 4b3aa1abf36..715af365c38 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -394,7 +394,7 @@ static void GenOpenCLArgMetadata(const FunctionDecl *FD, llvm::Function *Fn, if (ty->isImageType()) AddrSpc = CGM.getContext().getTargetAddressSpace(LangAS::opencl_global); - + addressQuals.push_back(Builder.getInt32(AddrSpc)); // Get argument type name. diff --git a/clang/lib/CodeGen/CodeGenPGO.cpp b/clang/lib/CodeGen/CodeGenPGO.cpp index 5475342ecdd..f81cbecd5d3 100644 --- a/clang/lib/CodeGen/CodeGenPGO.cpp +++ b/clang/lib/CodeGen/CodeGenPGO.cpp @@ -480,8 +480,7 @@ llvm::MDNode *CodeGenPGO::createBranchWeights(uint64_t TrueCount, return MDHelper.createBranchWeights(TrueCount + 1, FalseCount + 1); } -llvm::MDNode * -CodeGenPGO::createBranchWeights(ArrayRef<uint64_t> Weights) { +llvm::MDNode *CodeGenPGO::createBranchWeights(ArrayRef<uint64_t> Weights) { llvm::MDBuilder MDHelper(CGM.getLLVMContext()); // TODO: need to scale down to 32-bits, instead of just truncating. // According to Laplace's Rule of Succession, it is better to compute the |
