commit 900e1dac1b2da6fae567e8e2da7a36f7b2cbd625
author Nicolas Capens <capn@google.com> Sun Jun 23 00:14:55 2019 -0400
committer Ben Clayton <bclayton@google.com> Sun Jun 23 18:09:26 2019 +0000
tree 528ba97dcdfb941fb08dfe5545699ca49d1f9d29
parent c8f25d90ac2b3bc0e520409b9e71307b5ac77adf

Fix setting LLVM data layout before optimizations passes

The data layout was only being set right before lowering to machine
code. The optimization passes need accurate data layout info as well.

Bug: b/135691587
Change-Id: Ic1524d57bb6d8d0eb725e33d27e100a6286f1571
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/33309
Tested-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Reactor/LLVMReactor.cpp

diff --git a/src/Reactor/LLVMReactor.cpp b/src/Reactor/LLVMReactor.cpp
index d709d3c..d19cf52 100644
--- a/src/Reactor/LLVMReactor.cpp
+++ b/src/Reactor/LLVMReactor.cpp
@@ -678,6 +678,7 @@
 		void startSession()
 		{
 			::module = new llvm::Module("", *::context);
+			::module->setDataLayout(dataLayout);
 		}
 
 		void endSession()
@@ -705,7 +706,6 @@
 			// been freed.
 			std::unique_ptr<llvm::Module> mod(::module);
 			::module = nullptr;
-			mod->setDataLayout(dataLayout);
 
 			auto moduleKey = session.allocateVModule();