diff --git a/lib/IRGen/IRGen.cpp b/lib/IRGen/IRGen.cpp
index a3f02ea4677..071334d8818 100644
--- a/lib/IRGen/IRGen.cpp
+++ b/lib/IRGen/IRGen.cpp
@@ -242,7 +242,7 @@ static std::unique_ptr<llvm::Module> performIRGeneration(IRGenOptions &Opts,
   
   // Configure the function passes.
   FunctionPassManager FunctionPasses(Module);
-  FunctionPasses.add(new llvm::DataLayout(*DataLayout));
+  FunctionPasses.add(new llvm::DataLayoutPass(*DataLayout));
   if (Opts.Verify)
     FunctionPasses.add(createVerifierPass());
   PMBuilder.populateFunctionPassManager(FunctionPasses);
@@ -256,7 +256,7 @@ static std::unique_ptr<llvm::Module> performIRGeneration(IRGenOptions &Opts,
 
   // Configure the module passes.
   PassManager ModulePasses;
-  ModulePasses.add(new llvm::DataLayout(*DataLayout));
+  ModulePasses.add(new llvm::DataLayoutPass(*DataLayout));
   PMBuilder.populateModulePassManager(ModulePasses);
   if (Opts.Verify)
     ModulePasses.add(createVerifierPass());
diff --git a/lib/Immediate/Immediate.cpp b/lib/Immediate/Immediate.cpp
index c6f1d8ce9c1..d8e7cd23863 100644
--- a/lib/Immediate/Immediate.cpp
+++ b/lib/Immediate/Immediate.cpp
@@ -327,7 +327,7 @@ void swift::RunImmediately(CompilerInstance &CI, const ProcessCmdLine &CmdLine,
   PMBuilder.OptLevel = 2;
   PMBuilder.Inliner = llvm::createFunctionInliningPass(200);
   llvm::PassManager ModulePasses;
-  ModulePasses.add(new llvm::DataLayout(Module->getDataLayout()));
+  ModulePasses.add(new llvm::DataLayoutPass(*Module->getDataLayout()));
   PMBuilder.populateModulePassManager(ModulePasses);
   ModulePasses.run(*Module);