Merge pull request #6692 from ethereum/runEndToEndTestsViaYul

Run end to end tests via yul

test/libsolidity/SolidityEndToEndTest.cpp

@@ -43,6 +43,13 @@ using namespace std;
 using namespace std::placeholders;
 using namespace dev::test;
 
+#define ALSO_VIA_YUL(CODE) \
+{ \
+	{ CODE } \
+	m_compileViaYul = true; \
+	{ CODE } \
+}
+
 namespace dev
 {
 namespace solidity
@@ -92,8 +99,10 @@ BOOST_AUTO_TEST_CASE(empty_contract)
 	char const* sourceCode = R"(
 		contract test { }
 	)";
-	compileAndRun(sourceCode);
+	ALSO_VIA_YUL(
-	BOOST_CHECK(callContractFunction("i_am_not_there()", bytes()).empty());
+		compileAndRun(sourceCode);
+		BOOST_CHECK(callContractFunction("i_am_not_there()", bytes()).empty());
+	)
 }
 
 BOOST_AUTO_TEST_CASE(exp_operator)

test/libsolidity/SolidityExecutionFramework.cpp

@@ -24,9 +24,11 @@
 #include <boost/test/framework.hpp>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
+using namespace dev;
 using namespace dev::test;
 using namespace dev::solidity;
 using namespace dev::solidity::test;
+using namespace std;
 
 SolidityExecutionFramework::SolidityExecutionFramework():
 	ExecutionFramework()
@@ -37,3 +39,60 @@ SolidityExecutionFramework::SolidityExecutionFramework(std::string const& _ipcPa
 	ExecutionFramework(_ipcPath, _evmVersion)
 {
 }
+
+bytes SolidityExecutionFramework::compileContract(
+	string const& _sourceCode,
+	string const& _contractName,
+	map<string, Address> const& _libraryAddresses
+)
+{
+	// Silence compiler version warning
+	std::string sourceCode = "pragma solidity >=0.0;\n";
+	if (
+		dev::test::Options::get().useABIEncoderV2 &&
+		_sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos
+	)
+		sourceCode += "pragma experimental ABIEncoderV2;\n";
+	sourceCode += _sourceCode;
+	m_compiler.reset();
+	m_compiler.setSources({{"", sourceCode}});
+	m_compiler.setLibraries(_libraryAddresses);
+	m_compiler.setEVMVersion(m_evmVersion);
+	m_compiler.setOptimiserSettings(m_optimiserSettings);
+	m_compiler.enableIRGeneration(m_compileViaYul);
+	if (!m_compiler.compile())
+	{
+		langutil::SourceReferenceFormatter formatter(std::cerr);
+
+		for (auto const& error: m_compiler.errors())
+			formatter.printErrorInformation(*error);
+		BOOST_ERROR("Compiling contract failed");
+	}
+	eth::LinkerObject obj;
+	if (m_compileViaYul)
+	{
+		yul::AssemblyStack asmStack(
+					m_evmVersion,
+					yul::AssemblyStack::Language::StrictAssembly,
+					// Ignore optimiser settings here because we need Yul optimisation to
+					// get code that does not exhaust the stack.
+					OptimiserSettings::full()
+					);
+		if (!asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(
+			_contractName.empty() ? m_compiler.lastContractName() : _contractName
+		)))
+		{
+			langutil::SourceReferenceFormatter formatter(std::cerr);
+
+			for (auto const& error: m_compiler.errors())
+				formatter.printErrorInformation(*error);
+			BOOST_ERROR("Assembly contract failed. IR: " + m_compiler.yulIROptimized({}));
+		}
+		asmStack.optimize();
+		obj = std::move(*asmStack.assemble(yul::AssemblyStack::Machine::EVM).bytecode);
+	}
+	else
+		obj = m_compiler.object(_contractName.empty() ? m_compiler.lastContractName() : _contractName);
+	BOOST_REQUIRE(obj.linkReferences.empty());
+	return obj.bytecode;
+}

test/libsolidity/SolidityExecutionFramework.h

@@ -65,55 +65,7 @@ public:
 		std::string const& _sourceCode,
 		std::string const& _contractName = "",
 		std::map<std::string, dev::test::Address> const& _libraryAddresses = std::map<std::string, dev::test::Address>()
-	)
+	);
-	{
-		// Silence compiler version warning
-		std::string sourceCode = "pragma solidity >=0.0;\n";
-		if (dev::test::Options::get().useABIEncoderV2 && _sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos)
-			sourceCode += "pragma experimental ABIEncoderV2;\n";
-		sourceCode += _sourceCode;
-		m_compiler.reset();
-		m_compiler.setSources({{"", sourceCode}});
-		m_compiler.setLibraries(_libraryAddresses);
-		m_compiler.setEVMVersion(m_evmVersion);
-		m_compiler.setOptimiserSettings(m_optimiserSettings);
-		m_compiler.enableIRGeneration(m_compileViaYul);
-		if (!m_compiler.compile())
-		{
-			langutil::SourceReferenceFormatter formatter(std::cerr);
-
-			for (auto const& error: m_compiler.errors())
-				formatter.printErrorInformation(*error);
-			BOOST_ERROR("Compiling contract failed");
-		}
-		eth::LinkerObject obj;
-		if (m_compileViaYul)
-		{
-			yul::AssemblyStack asmStack(
-				m_evmVersion,
-				yul::AssemblyStack::Language::StrictAssembly,
-				// Ignore optimiser settings here because we need Yul optimisation to
-				// get code that does not exhaust the stack.
-				OptimiserSettings::full()
-			);
-			if (!asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(
-				_contractName.empty() ? m_compiler.lastContractName() : _contractName
-			)))
-			{
-				langutil::SourceReferenceFormatter formatter(std::cerr);
-
-				for (auto const& error: m_compiler.errors())
-					formatter.printErrorInformation(*error);
-				BOOST_ERROR("Assembly contract failed. IR: " + m_compiler.yulIROptimized({}));
-			}
-			asmStack.optimize();
-			obj = std::move(*asmStack.assemble(yul::AssemblyStack::Machine::EVM).bytecode);
-		}
-		else
-			obj = m_compiler.object(_contractName.empty() ? m_compiler.lastContractName() : _contractName);
-		BOOST_REQUIRE(obj.linkReferences.empty());
-		return obj.bytecode;
-	}
 
 protected:
 	dev::solidity::CompilerStack m_compiler;