From 1da3af161f94b28b816fd5522795aaae3af190f3 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 9 Jun 2017 12:45:56 +0100
Subject: Simplify CodeGenerator by remove seldom used case

---
 libsolidity/interface/AssemblyStack.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libsolidity/interface/AssemblyStack.cpp')

diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index 31d9e494..b6151f56 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -86,7 +86,8 @@ eth::LinkerObject AssemblyStack::assemble(Machine _machine) const
 	{
 	case Machine::EVM:
 	{
-		auto assembly = assembly::CodeGenerator::assemble(*m_parserResult, *m_analysisInfo);
+		eth::Assembly assembly;
+		assembly::CodeGenerator::assemble(*m_parserResult, *m_analysisInfo, assembly);
 		return assembly.assemble();
 	}
 	case Machine::EVM15:
-- 
cgit v1.2.3


From 8768080a02d6862849705ee106c81672368721e6 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 9 Jun 2017 12:47:05 +0100
Subject: Remove excess includes

---
 libsolidity/interface/AssemblyStack.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libsolidity/interface/AssemblyStack.cpp')

diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index b6151f56..75877881 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -26,6 +26,7 @@
 #include <libsolidity/inlineasm/AsmPrinter.h>
 #include <libsolidity/inlineasm/AsmParser.h>
 #include <libsolidity/inlineasm/AsmAnalysis.h>
+#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 #include <libsolidity/inlineasm/AsmCodeGen.h>
 
 #include <libevmasm/Assembly.h>
-- 
cgit v1.2.3