From 1d17da1e5f61108075ae7f55a823d43a62b9e18a Mon Sep 17 00:00:00 2001
From: artur-zawlocki <artur.zawlocki@gmail.com>
Date: Thu, 2 Oct 2014 11:14:09 +0200
Subject: [PATCH] Added Module* constructor argument to Memory and Ext.

---
 evmcc/Compiler.cpp | 11 +++++------
 evmcc/Ext.cpp      |  5 ++---
 evmcc/Ext.h        |  4 ++--
 evmcc/Memory.cpp   |  4 +---
 evmcc/Memory.h     |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index 0dae87213..6c5229056 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -166,17 +166,16 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
 	auto mainFuncType = FunctionType::get(builder.getInt64Ty(), false);
 	auto mainFunc = Function::Create(mainFuncType, Function::ExternalLinkage, "main", module.get());
 
-	// Init stack and memory
-	auto stack = Stack(builder, module.get());
-	auto memory = Memory(builder);
-
-	auto ext = Ext(builder);
-
 	// Create the basic blocks.
 	auto entryBlock = BasicBlock::Create(context, "entry", mainFunc);
 	basicBlocks[0] = entryBlock;
 	createBasicBlocks(bytecode);
 
+	// Init runtime structures.
+	auto stack = Stack(builder, module.get());
+	auto memory = Memory(builder, module.get());
+	auto ext = Ext(builder, module.get());
+
 	auto userRet = false;
 	auto finished = false;
 
diff --git a/evmcc/Ext.cpp b/evmcc/Ext.cpp
index 0c38f73d3..e3bb17af6 100644
--- a/evmcc/Ext.cpp
+++ b/evmcc/Ext.cpp
@@ -43,10 +43,9 @@ struct ExtData
 	const byte* calldata;
 };
 
-Ext::Ext(llvm::IRBuilder<>& _builder)
+Ext::Ext(llvm::IRBuilder<>& _builder, llvm::Module* module)
 	: m_builder(_builder)
 {
-	auto module = m_builder.GetInsertBlock()->getParent()->getParent();
 	auto&& ctx = _builder.getContext();
 
 	auto i256Ty = m_builder.getIntNTy(256);
@@ -148,4 +147,4 @@ EXPORT void ext_calldataload(i256* _index, i256* _value)
 
 }
 
-}
\ No newline at end of file
+}
diff --git a/evmcc/Ext.h b/evmcc/Ext.h
index a579dca81..8c08acdfe 100644
--- a/evmcc/Ext.h
+++ b/evmcc/Ext.h
@@ -13,7 +13,7 @@ namespace evmcc
 class Ext
 {
 public:
-	Ext(llvm::IRBuilder<>& _builder);
+	Ext(llvm::IRBuilder<>& _builder, llvm::Module* module);
 	static void init(std::unique_ptr<dev::eth::ExtVMFace> _ext);
 
 	llvm::Value* store(llvm::Value* _index);
@@ -43,4 +43,4 @@ private:
 };
 	
 
-}
\ No newline at end of file
+}
diff --git a/evmcc/Memory.cpp b/evmcc/Memory.cpp
index 2a1a0f727..fd7727b59 100644
--- a/evmcc/Memory.cpp
+++ b/evmcc/Memory.cpp
@@ -26,13 +26,11 @@ using MemoryImpl = dev::bytes;
 static MemoryImpl* evmccrt_memory;
 
 
-Memory::Memory(llvm::IRBuilder<>& _builder)
+Memory::Memory(llvm::IRBuilder<>& _builder, llvm::Module* module)
 	: m_builder(_builder)
 {
 	auto voidTy	= m_builder.getVoidTy();
 	auto i64Ty = m_builder.getInt64Ty();
-	auto module = _builder.GetInsertBlock()->getParent()->getParent();
-
 
 	auto memRequireTy = llvm::FunctionType::get(m_builder.getInt8PtrTy(), i64Ty, false);
 	m_memRequire = llvm::Function::Create(memRequireTy,
diff --git a/evmcc/Memory.h b/evmcc/Memory.h
index b36386325..87ce27ed0 100644
--- a/evmcc/Memory.h
+++ b/evmcc/Memory.h
@@ -10,7 +10,7 @@ namespace evmcc
 class Memory
 {
 public:
-	Memory(llvm::IRBuilder<>& _builder);
+	Memory(llvm::IRBuilder<>& _builder, llvm::Module* module);
 
 	static const dev::bytes& init();