Special treatment for differences between ABI encoders.

test/libsolidity/ABIDecoderTests.cpp

@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(enums)
 			}
 		}
 	)";
-	bool newDecoder = false;
+	bool newDecoder = dev::test::Options::get().useABIEncoderV2;
 	BOTH_ENCODERS(
 		compileAndRun(sourceCode);
 		ABI_CHECK(callContractFunction("f(uint8)", 0), encodeArgs(u256(0)));

test/libsolidity/ABIEncoderTests.cpp

@@ -164,10 +164,13 @@ BOOST_AUTO_TEST_CASE(memory_array_one_dim)
 		}
 	)";
 
+	if (!dev::test::Options::get().useABIEncoderV2)
+	{
 		compileAndRun(sourceCode);
 		callContractFunction("f()");
 		// The old encoder does not clean array elements.
 		REQUIRE_LOG_DATA(encodeArgs(10, 0x60, 11, 3, u256("0xfffffffe"), u256("0xffffffff"), u256("0x100000000")));
+	}
 
 	compileAndRun(NewEncoderPragma + sourceCode);
 	callContractFunction("f()");

test/libsolidity/GasCosts.cpp

@@ -70,6 +70,9 @@ BOOST_AUTO_TEST_CASE(string_storage)
 
 	if (Options::get().evmVersion() <= EVMVersion::byzantium())
 		CHECK_GAS(134435, 130591, 100);
+	// This is only correct on >=Constantinople.
+	else if (Options::get().useABIEncoderV2)
+		CHECK_GAS(151819, 142753, 100);
 	else
 		CHECK_GAS(127225, 124873, 100);
 	if (Options::get().evmVersion() >= EVMVersion::byzantium())
@@ -77,6 +80,9 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		callContractFunction("f()");
 		if (Options::get().evmVersion() == EVMVersion::byzantium())
 			CHECK_GAS(21551, 21526, 20);
+		// This is only correct on >=Constantinople.
+		else if (Options::get().useABIEncoderV2)
+			CHECK_GAS(21713, 21635, 20);
 		else
 			CHECK_GAS(21546, 21526, 20);
 	}

test/libsolidity/GasMeter.cpp

@@ -73,10 +73,15 @@ public:
 		// costs for transaction
 		gas += gasForTransaction(m_compiler.object(m_compiler.lastContractName()).bytecode, true);
 
+		// Skip the tests when we force ABIEncoderV2.
+		// TODO: We should enable this again once the yul optimizer is activated.
+		if (!dev::test::Options::get().useABIEncoderV2)
+		{
 			BOOST_REQUIRE(!gas.isInfinite);
 			BOOST_CHECK_LE(m_gasUsed, gas.value);
 			BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
 		}
+	}
 
 	/// Compares the gas computed by PathGasMeter for the given signature (but unknown arguments)
 	/// against the actual gas usage computed by the VM on the given set of argument variants.
@@ -97,10 +102,15 @@ public:
 			*m_compiler.runtimeAssemblyItems(m_compiler.lastContractName()),
 			_sig
 		);
+		// Skip the tests when we force ABIEncoderV2.
+		// TODO: We should enable this again once the yul optimizer is activated.
+		if (!dev::test::Options::get().useABIEncoderV2)
+		{
 			BOOST_REQUIRE(!gas.isInfinite);
 			BOOST_CHECK_LE(m_gasUsed, gas.value);
 			BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
 		}
+	}
 
 	static GasMeter::GasConsumption gasForTransaction(bytes const& _data, bool _isCreation)
 	{

test/libsolidity/SolidityEndToEndTest.cpp

@@ -14317,13 +14317,18 @@ BOOST_AUTO_TEST_CASE(abi_encode_empty_string)
 			}
 		}
 	)";
+
 	compileAndRun(sourceCode, 0, "C");
+	if (!dev::test::Options::get().useABIEncoderV2)
+	{
+		// ABI Encoder V2 has slightly different padding, tested below.
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(
 			0x40, 0xc0,
 			0x60, 0x20, 0x00, 0x00,
 			0x00
 		));
 	}
+}
 
 BOOST_AUTO_TEST_CASE(abi_encode_empty_string_v2)
 {