Author: pete
Date: Wed Nov 18 16:53:40 2015
New Revision: 253519
URL: http://llvm.org/viewvc/llvm-project?rev=253519&view=rev
Log:
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.
Modified:
cfe/trunk/lib/CodeGen/CGBuilder.h
Modified: cfe/trunk/lib/CodeGen/CGBuilder.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuilder.h?rev=253519&r1=253518&r2=253519&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuilder.h (original)
+++ cfe/trunk/lib/CodeGen/CGBuilder.h Wed Nov 18 16:53:40 2015
@@ -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;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
