]> granicus.if.org Git - clang/commitdiff
Fix debian build after r253512.
authorPete Cooper <peter_cooper@apple.com>
Wed, 18 Nov 2015 22:53:40 +0000 (22:53 +0000)
committerPete Cooper <peter_cooper@apple.com>
Wed, 18 Nov 2015 22:53:40 +0000 (22:53 +0000)
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

lib/CodeGen/CGBuilder.h

index 4daf0c760ef8cd645785a79928eb39a779cd9b9d..51c4a16e8d29ec7f7f1db17c7f0a6c3e76cf87c9 100644 (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;