Merge pull request #15661 from ipsilon/eof-syntax-tests-update

eof: Syntax tests update

Author: cameel

libevmasm/Assembly.cpp

@@ -1660,7 +1660,14 @@ LinkerObject const& Assembly::assembleEOF() const
 
 		ptrdiff_t const relativeJumpOffset = static_cast<ptrdiff_t>(tagPos) - (static_cast<ptrdiff_t>(refPos) + 2);
 		// This cannot happen in practice because we'll run into section size limit first.
-		solAssert(-0x8000 <= relativeJumpOffset && relativeJumpOffset <= 0x7FFF, "Relative jump too far");
+		if (!(-0x8000 <= relativeJumpOffset && relativeJumpOffset <= 0x7FFF))
+			// TODO: Include source location. Note that origin locations we have in debug data are
+			// not usable for error reporting when compiling pure Yul because they point at the optimized source.
+			throw Error(
+				2703_error,
+				Error::Type::CodeGenerationError,
+				"Relative jump too far"
+			);
 		solAssert(relativeJumpOffset < -2 || 0 <= relativeJumpOffset, "Relative jump offset into immediate argument.");
 		setBigEndianUint16(ret.bytecode, refPos, static_cast<size_t>(static_cast<uint16_t>(relativeJumpOffset)));
 	}

test/libsolidity/SyntaxTest.cpp

@@ -48,7 +48,9 @@ SyntaxTest::SyntaxTest(
 {
 	static std::set<std::string> const compileViaYulAllowedValues{"true", "false"};
 
-	m_compileViaYul = m_reader.stringSetting("compileViaYul", "false");
+	auto const eofEnabled = solidity::test::CommonOptions::get().eofVersion().has_value();
+
+	m_compileViaYul = m_reader.stringSetting("compileViaYul", eofEnabled ? "true" : "false");
 	if (!util::contains(compileViaYulAllowedValues, m_compileViaYul))
 		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + m_compileViaYul + "."));
 	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);

test/libsolidity/semanticTests/array/nested_calldata_storage.sol

@@ -0,0 +1,13 @@
+pragma abicoder               v2;
+
+contract C {
+    uint[][2] public tmp_i;
+    function i(uint[][2] calldata s) external { tmp_i = s; }
+}
+// ====
+// compileViaYul: true
+// ----
+// i(uint256[][2]): 0x20, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04
+// gas irOptimized: 223100
+// tmp_i(uint256,uint256): 0, 0 -> 0x0A01
+// tmp_i(uint256,uint256): 1, 0 -> 0x0B01

test/libsolidity/semanticTests/array/nested_calldata_storage2.sol

@@ -0,0 +1,13 @@
+pragma abicoder               v2;
+
+contract C {
+    uint[][] public tmp_i;
+    function i(uint[][] calldata s) external { tmp_i = s; }
+}
+// ====
+// compileViaYul: true
+// ----
+// i(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04
+// gas irOptimized: 245506
+// tmp_i(uint256,uint256): 0, 0 -> 0x0A01
+// tmp_i(uint256,uint256): 1, 0 -> 0x0B01

test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol

@@ -13,4 +13,6 @@ contract D {
         return a + b;
     }
 }
+// ====
+// bytecodeFormat: legacy
 // ----

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol

@@ -19,4 +19,6 @@ contract Test {
         L.set(item);
     }
 }
+// ====
+// bytecodeFormat: legacy
 // ----

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol

@@ -19,4 +19,6 @@ contract Test {
         L.get(item);
     }
 }
+// ====
+// bytecodeFormat: legacy
 // ----

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol

@@ -25,4 +25,6 @@ contract C is B {
         validate()
     {}
 }
+// ====
+// bytecodeFormat: legacy
 // ----

test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol

@@ -32,4 +32,6 @@ import "B";
 contract D is C {
     constructor() validate B() validate C() validate {}
 }
+// ====
+// bytecodeFormat: legacy
 // ----

test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol

@@ -23,4 +23,6 @@ pragma abicoder v1;
 import "A";
 
 contract C is B {}
+// ====
+// bytecodeFormat: legacy
 // ----