Fix setting LLVM data layout before optimizations passes

c0d1f1ed · ben-clayton · commit 900e1dac1b2d · 2019-06-23T18:09:26.000Z
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>
diff --git a/src/Reactor/LLVMReactor.cpp b/src/Reactor/LLVMReactor.cpp
@@ -678,6 +678,7 @@ namespace rr
 		void startSession()
 		{
 			::module = new llvm::Module("", *::context);
+			::module->setDataLayout(dataLayout);
 		}
 
 		void endSession()
@@ -705,7 +706,6 @@ namespace rr
 			// been freed.
 			std::unique_ptr<llvm::Module> mod(::module);
 			::module = nullptr;
-			mod->setDataLayout(dataLayout);
 
 			auto moduleKey = session.allocateVModule();
 

Original file line number	Diff line number	Diff line change
`@@ -678,6 +678,7 @@ namespace rr`
`678`	`678`	`void startSession()`
`679`	`679`	`{`
`680`	`680`	`::module = new llvm::Module("", *::context);`
	`681`	`+ ::module->setDataLayout(dataLayout);`
`681`	`682`	`}`
`682`	`683`
`683`	`684`	`void endSession()`
`@@ -705,7 +706,6 @@ namespace rr`
`705`	`706`	`// been freed.`
`706`	`707`	`std::unique_ptr<llvm::Module> mod(::module);`
`707`	`708`	`::module = nullptr;`
`708`		`- mod->setDataLayout(dataLayout);`
`709`	`709`
`710`	`710`	`auto moduleKey = session.allocateVModule();`
`711`	`711`