summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorPete Cooper <peter_cooper@apple.com>2015-11-18 22:53:40 +0000
committerPete Cooper <peter_cooper@apple.com>2015-11-18 22:53:40 +0000
commiteb3bc60e62f5da813f8ecd9d9f587c33126d44f2 (patch)
tree5c64a989e342ab96ddbe309c98774c5c94a77ba5 /clang/lib/CodeGen
parentadb4057a153a8f5d315cfcdeada125742c04345f (diff)
downloadbcm5719-llvm-eb3bc60e62f5da813f8ecd9d9f587c33126d44f2.tar.gz
bcm5719-llvm-eb3bc60e62f5da813f8ecd9d9f587c33126d44f2.zip
Fix debian build after r253512.
The conversion from QuantityType to the (temporary) IntegerAlignment class was ambiguous. For now add in explicit conversion to unsigned to satisfy the clang-x86_64-debian-fast bot. I'll remove the explicit conversion when I remove the IntegerAlignment class. llvm-svn: 253519
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGBuilder.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGBuilder.h b/clang/lib/CodeGen/CGBuilder.h
index 4daf0c760ef..51c4a16e8d2 100644
--- a/clang/lib/CodeGen/CGBuilder.h
+++ b/clang/lib/CodeGen/CGBuilder.h
@@ -273,13 +273,13 @@ public:
bool IsVolatile = false) {
return CreateMemCpy(Dest.getPointer(), Src.getPointer(), Size,
Dest.getAlignment().getQuantity(),
- Src.getAlignment().getQuantity(), IsVolatile);
+ (unsigned)Src.getAlignment().getQuantity(), IsVolatile);
}
llvm::CallInst *CreateMemCpy(Address Dest, Address Src, uint64_t Size,
bool IsVolatile = false) {
return CreateMemCpy(Dest.getPointer(), Src.getPointer(), Size,
Dest.getAlignment().getQuantity(),
- Src.getAlignment().getQuantity(), IsVolatile);
+ (unsigned)Src.getAlignment().getQuantity(), IsVolatile);
}
using CGBuilderBaseTy::CreateMemMove;
@@ -287,7 +287,8 @@ public:
bool IsVolatile = false) {
return CreateMemMove(Dest.getPointer(), Src.getPointer(), Size,
Dest.getAlignment().getQuantity(),
- Src.getAlignment().getQuantity(), IsVolatile);
+ (unsigned)Src.getAlignment().getQuantity(),
+ IsVolatile);
}
using CGBuilderBaseTy::CreateMemSet;
OpenPOWER on IntegriCloud