Clean up LazyFunction initialization in Array helper.

evmjit/libevmjit/Array.cpp

@@ -217,11 +217,7 @@ llvm::Type* Array::getType()
 }
 
 Array::Array(llvm::IRBuilder<>& _builder, char const* _name) :
-	CompilerHelper(_builder),
-	m_pushFunc([this](){ return createArrayPushFunc(); }),
-	m_setFunc([this](){ return createArraySetFunc(); }),
-	m_getFunc([this](){ return createArrayGetFunc(); }),
-	m_freeFunc([this](){ return createFreeFunc(); })
+	CompilerHelper(_builder)
 {
 	m_array = m_builder.CreateAlloca(getType(), nullptr, _name);
 	m_builder.CreateStore(llvm::ConstantAggregateZero::get(getType()), m_array);
@@ -229,11 +225,7 @@ Array::Array(llvm::IRBuilder<>& _builder, char const* _name) :
 
 Array::Array(llvm::IRBuilder<>& _builder, llvm::Value* _array) :
 	CompilerHelper(_builder),
-	m_array(_array),
-	m_pushFunc([this](){ return createArrayPushFunc(); }),
-	m_setFunc([this](){ return createArraySetFunc(); }),
-	m_getFunc([this](){ return createArrayGetFunc(); }),
-	m_freeFunc([this](){ return createFreeFunc(); })
+	m_array(_array)
 {
 	m_builder.CreateStore(llvm::ConstantAggregateZero::get(getType()), m_array);
 }

evmjit/libevmjit/Array.h

@@ -59,10 +59,10 @@ private:
 	llvm::Function* getReallocFunc();
 
 	LazyFunction m_pushFunc = {[this](){ return createArrayPushFunc(); }}; // TODO: If works on MSVC, remove form initialization list
-	LazyFunction m_setFunc;
+	LazyFunction m_setFunc = {[this](){ return createArraySetFunc(); }};
 	LazyFunction m_getPtrFunc = {[this](){ return createGetPtrFunc(); }};
-	LazyFunction m_getFunc;
-	LazyFunction m_freeFunc;
+	LazyFunction m_getFunc = {[this](){ return createArrayGetFunc(); }};
+	LazyFunction m_freeFunc = {[this](){ return createFreeFunc(); }};
 	LazyFunction m_extendFunc = {[this](){ return createExtendFunc(); }};
 	LazyFunction m_reallocFunc = {[this](){ return getReallocFunc(); }};
 };
@@ -70,5 +70,3 @@ private:
 }
 }
 }
-
-