diff options
author | Pete Cooper <peter_cooper@apple.com> | 2015-11-18 22:53:40 +0000 |
---|---|---|
committer | Pete Cooper <peter_cooper@apple.com> | 2015-11-18 22:53:40 +0000 |
commit | f88e4c3900a1cd9e7ab80c171f9ee91e9667e95b (patch) | |
tree | 0be6970fa31e791d4020218cff5c367cd701aa79 /lib/CodeGen/CGBuilder.h | |
parent | a121fca3f3d932cdeed9e839db4c7ded0cd80b00 (diff) |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253519 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGBuilder.h')
-rw-r--r-- | lib/CodeGen/CGBuilder.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/CGBuilder.h b/lib/CodeGen/CGBuilder.h index 4daf0c760e..51c4a16e8d 100644 --- a/lib/CodeGen/CGBuilder.h +++ b/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; |