Index: lib/CodeGen/BlockGenerators.cpp
===================================================================
--- lib/CodeGen/BlockGenerators.cpp
+++ lib/CodeGen/BlockGenerators.cpp
@@ -222,8 +222,9 @@
   const Instruction *Inst = dyn_cast<Instruction>(Load);
   Value *NewPointer =
       generateLocationAccessed(Inst, Pointer, BBMap, GlobalMap, LTS);
-  Value *ScalarLoad =
+  LoadInst *ScalarLoad =
       Builder.CreateLoad(NewPointer, Load->getName() + "_p_scalar_");
+  ScalarLoad->setAlignment(Load->getAlignment());
   return ScalarLoad;
 }
 
@@ -237,7 +238,9 @@
   Value *ValueOperand = getNewValue(Store->getValueOperand(), BBMap, GlobalMap,
                                     LTS, getLoopForInst(Store));
 
-  return Builder.CreateStore(ValueOperand, NewPointer);
+  StoreInst *NewStore = Builder.CreateStore(ValueOperand, NewPointer);
+  NewStore->setAlignment(Store->getAlignment());
+  return NewStore;
 }
 
 void BlockGenerator::copyInstruction(const Instruction *Inst, ValueMapT &BBMap,