From 00e5afc1a52c7f12706252522638534a864be4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Tue, 14 Oct 2014 18:26:47 +0200
Subject: [PATCH] Change a bit  the implementation of GAS instruction

[Delivers #79942174]
---
 evmcc/Compiler.cpp | 3 +--
 evmcc/GasMeter.cpp | 4 ++--
 evmcc/GasMeter.h   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index 3d43e5e54..00ea5c12e 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -690,8 +690,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
 
 			case Instruction::GAS:
 			{
-				auto value = builder.CreateLoad(gasMeter.getLLVMGasVar());
-				stack.push(value);
+				stack.push(gasMeter.getGas());
 				break;
 			}
 
diff --git a/evmcc/GasMeter.cpp b/evmcc/GasMeter.cpp
index cd7f9eb33..ab38bd85c 100644
--- a/evmcc/GasMeter.cpp
+++ b/evmcc/GasMeter.cpp
@@ -167,9 +167,9 @@ void GasMeter::checkMemory(llvm::Value* _additionalMemoryInWords, llvm::IRBuilde
 	_builder.CreateCall(m_gasCheckFunc, cost);
 }
 
-llvm::GlobalVariable* GasMeter::getLLVMGasVar()
+llvm::Value* GasMeter::getGas()
 {
-	return m_gas;
+	m_builder.CreateLoad(m_gas, "gas");
 }
 
 }
diff --git a/evmcc/GasMeter.h b/evmcc/GasMeter.h
index a47bb2244..60a1136b9 100644
--- a/evmcc/GasMeter.h
+++ b/evmcc/GasMeter.h
@@ -32,7 +32,7 @@ public:
 	/// Generate code that checks the cost of additional memory used by program
 	void checkMemory(llvm::Value* _additionalMemoryInWords, llvm::IRBuilder<>& _builder);
 
-	llvm::GlobalVariable* getLLVMGasVar();
+	llvm::Value* getGas();
 
 private:
 	/// Cumulative gas cost of a block of instructions