maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Pete Cooper 2015-11-18 22:53:40 +00:00
parent adb4057a15
commit eb3bc60e62
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/CodeGen/CGBuilder.h
View File

@ -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;