---

yaml
---
r: 349242
b: refs/heads/master-next
c: a007f64
h: refs/heads/master

Author: smeenai

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 0ba3e30c10e85eff6c8ba48152d4e79453547dd7
+refs/heads/master-next: a007f646fbfa24c9ad623712cb2a1585f2e83e74
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/IRGen/GenCall.cpp

@@ -2076,7 +2076,7 @@ static void emitCoerceAndExpand(IRGenFunction &IGF, Explosion &in,
       Alignment(coercionTyLayout->getAlignment().value());
   auto alloca = cast<llvm::AllocaInst>(temporary.getAddress());
   if (alloca->getAlignment() < coercionTyAlignment.getValue()) {
-    alloca->setAlignment(coercionTyAlignment.getValue());
+    alloca->setAlignment(llvm::MaybeAlign(coercionTyAlignment.getValue()));
     temporary = Address(temporary.getAddress(), coercionTyAlignment);
   }
 
@@ -2353,7 +2353,7 @@ static void externalizeArguments(IRGenFunction &IGF, const Callee &callee,
         auto ABIAlign = AI.getIndirectAlign();
         if (ABIAlign > addr.getAlignment()) {
           auto *AS = cast<llvm::AllocaInst>(addr.getAddress());
-          AS->setAlignment(ABIAlign.getQuantity());
+          AS->setAlignment(llvm::MaybeAlign(ABIAlign.getQuantity()));
           addr = Address(addr.getAddress(), Alignment(ABIAlign.getQuantity()));
         }
       }
@@ -3027,7 +3027,7 @@ static void adjustAllocaAlignment(const llvm::DataLayout &DL,
   Alignment layoutAlignment = Alignment(layout->getAlignment().value());
   auto alloca = cast<llvm::AllocaInst>(allocaAddr.getAddress());
   if (alloca->getAlignment() < layoutAlignment.getValue()) {
-    alloca->setAlignment(layoutAlignment.getValue());
+    alloca->setAlignment(llvm::MaybeAlign(layoutAlignment.getValue()));
     allocaAddr = Address(allocaAddr.getAddress(), layoutAlignment);
   }
 }

branches/master-next/lib/IRGen/GenDecl.cpp

@@ -4152,7 +4152,7 @@ Address IRGenFunction::createAlloca(llvm::Type *type,
   llvm::AllocaInst *alloca =
       new llvm::AllocaInst(type, IGM.DataLayout.getAllocaAddrSpace(), name,
                            AllocaIP);
-  alloca->setAlignment(alignment.getValue());
+  alloca->setAlignment(llvm::MaybeAlign(alignment.getValue()));
   return Address(alloca, alignment);
 }
 

branches/master-next/lib/IRGen/GenOpaque.cpp

@@ -549,7 +549,7 @@ StackAddress IRGenFunction::emitDynamicAlloca(llvm::Type *eltTy,
 
   // Emit the dynamic alloca.
   auto *alloca = Builder.IRBuilderBase::CreateAlloca(eltTy, arraySize, name);
-  alloca->setAlignment(align.getValue());
+  alloca->setAlignment(llvm::MaybeAlign(align.getValue()));
 
   assert(!isInEntryBlock ||
          getActiveDominancePoint().isUniversal() &&

branches/master-next/lib/IRGen/IRBuilder.h

@@ -125,7 +125,7 @@ class IRBuilder : public IRBuilderBase {
   llvm::LoadInst *CreateLoad(llvm::Value *addr, Alignment align,
                              const llvm::Twine &name = "") {
     llvm::LoadInst *load = IRBuilderBase::CreateLoad(addr, name);
-    load->setAlignment(align.getValue());
+    load->setAlignment(llvm::MaybeAlign(align.getValue()));
     return load;
   }
   llvm::LoadInst *CreateLoad(Address addr, const llvm::Twine &name = "") {