eof: objectCompiler tests updating

Author: rodiazet

test/libyul/ObjectCompilerTest.cpp

@@ -32,6 +32,7 @@
 #include <liblangutil/DebugInfoSelection.h>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
 
 #include <ostream>
 
@@ -78,18 +79,34 @@ TestCase::TestResult ObjectCompilerTest::run(std::ostream& _stream, std::string
 	solAssert(obj.bytecode);
 	solAssert(obj.sourceMappings);
 
-	m_obtainedResult = "Assembly:\n" + obj.assembly->assemblyString(yulStack.debugInfoSelection());
+	constexpr std::array allowedOutputs = {"Assembly", "Bytecode", "Opcodes", "SourceMappings"};
+	auto const outputSetting = m_reader.stringSetting("output", "Assembly,Bytecode,Opcodes,SourceMappings");
+	std::vector<std::string> outputs;
+	boost::split(outputs, outputSetting, boost::is_any_of(","));
+	for (auto const& output: outputs)
+		if (std::find(allowedOutputs.begin(), allowedOutputs.end(), output) == allowedOutputs.end())
+			BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid output type: \"" + output + "\""});
+
+	if (std::find(outputs.begin(), outputs.end(), "Assembly") != outputs.end())
+		m_obtainedResult = "Assembly:\n" + obj.assembly->assemblyString(yulStack.debugInfoSelection());
 	if (obj.bytecode->bytecode.empty())
 		m_obtainedResult += "-- empty bytecode --\n";
 	else
-		m_obtainedResult +=
-			"Bytecode: " +
-			util::toHex(obj.bytecode->bytecode) +
-			"\nOpcodes: " +
-			boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion())) +
-			"\nSourceMappings:" +
-			(obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) +
-			"\n";
+	{
+		if (std::find(outputs.begin(), outputs.end(), "Bytecode") != outputs.end())
+			m_obtainedResult += "Bytecode: " + util::toHex(obj.bytecode->bytecode);
+		if (std::find(outputs.begin(), outputs.end(), "Opcodes") != outputs.end())
+		{
+			m_obtainedResult += (!m_obtainedResult.empty() && m_obtainedResult.back() != '\n') ? "\n" : "";
+			m_obtainedResult += "Opcodes: " +
+				boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion()));
+		}
+		if (std::find(outputs.begin(), outputs.end(), "SourceMappings") != outputs.end())
+		{
+			m_obtainedResult += (!m_obtainedResult.empty() && m_obtainedResult.back() != '\n') ? "\n" : "";
+			m_obtainedResult += "SourceMappings:" + (obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) + "\n";
+		}
+	}
 
 	return checkResult(_stream, _linePrefix, _formatted);
 }

test/libyul/objectCompiler/data.yul

@@ -1,10 +1,12 @@
 object "a" {
   code {}
   // Unreferenced data is not added to the assembled bytecode.
+  // TODO: This is not implemented for EOF. Should work for legacy and EOF when implemented.
   data "str" "Hello, World!"
 }
 // ====
 // EVMVersion: >=constantinople
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":22:29   */

test/libyul/objectCompiler/datacopy.yul

@@ -13,6 +13,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":77:92   */

test/libyul/objectCompiler/dataoffset_code.yul

@@ -7,6 +7,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":44:61   */

test/libyul/objectCompiler/dataoffset_data.yul

@@ -4,6 +4,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":56:75   */

test/libyul/objectCompiler/dataoffset_self.yul

@@ -4,6 +4,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":44:59   */

test/libyul/objectCompiler/datasize_code.yul

@@ -7,6 +7,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":44:59   */

test/libyul/objectCompiler/datasize_data.yul

@@ -4,6 +4,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":44:61   */

test/libyul/objectCompiler/datasize_self.yul

@@ -4,6 +4,7 @@ object "a" {
 }
 // ====
 // EVMVersion: >=shanghai
+// bytecodeFormat: legacy
 // ----
 // Assembly:
 //     /* "source":36:49   */

test/libyul/objectCompiler/eof/leading_and_trailing_dots.yul

@@ -0,0 +1,30 @@
+{
+    function e(_._) {
+        e(0)
+    }
+    e(2)
+    function f(n._) {
+        f(0)
+    }
+    f(2)
+    function g(_.n) {
+        g(0)
+    }
+    g(2)
+}
+// ====
+// bytecodeFormat: >=EOFv1
+// outputs: Assembly
+// ----
+// Assembly:
+//     /* "source":53:54   */
+//   0x02
+//     /* "source":51:55   */
+//   jumpf{code_section_1}
+//
+// code_section_1: assembly {
+//         /* "source":136:137   */
+//       0x00
+//         /* "source":134:138   */
+//       jumpf{code_section_1}
+// }