aboutsummaryrefslogtreecommitdiffstats
path: root/test/libsolidity
diff options
context:
space:
mode:
Diffstat (limited to 'test/libsolidity')
-rw-r--r--test/libsolidity/ABIEncoderTests.cpp259
-rw-r--r--test/libsolidity/GasMeter.cpp3
-rw-r--r--test/libsolidity/Imports.cpp70
-rw-r--r--test/libsolidity/JSONCompiler.cpp97
-rw-r--r--test/libsolidity/Metadata.cpp72
-rw-r--r--test/libsolidity/SolidityEndToEndTest.cpp323
-rw-r--r--test/libsolidity/SolidityExecutionFramework.h4
-rw-r--r--test/libsolidity/SolidityNameAndTypeResolution.cpp353
-rw-r--r--test/libsolidity/SolidityNatspecJSON.cpp4
-rw-r--r--test/libsolidity/SolidityOptimizer.cpp823
-rw-r--r--test/libsolidity/SolidityParser.cpp7
11 files changed, 1100 insertions, 915 deletions
diff --git a/test/libsolidity/ABIEncoderTests.cpp b/test/libsolidity/ABIEncoderTests.cpp
new file mode 100644
index 00000000..44c673c5
--- /dev/null
+++ b/test/libsolidity/ABIEncoderTests.cpp
@@ -0,0 +1,259 @@
+/*
+ This file is part of solidity.
+
+ solidity is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ solidity is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with solidity. If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * Unit tests for Solidity's ABI encoder.
+ */
+
+#include <functional>
+#include <string>
+#include <tuple>
+#include <boost/test/unit_test.hpp>
+#include <libsolidity/interface/Exceptions.h>
+#include <test/libsolidity/SolidityExecutionFramework.h>
+
+using namespace std;
+using namespace std::placeholders;
+using namespace dev::test;
+
+namespace dev
+{
+namespace solidity
+{
+namespace test
+{
+
+#define REQUIRE_LOG_DATA(DATA) do { \
+ BOOST_REQUIRE_EQUAL(m_logs.size(), 1); \
+ BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); \
+ BOOST_CHECK_EQUAL(toHex(m_logs[0].data), toHex(DATA)); \
+} while (false)
+
+BOOST_FIXTURE_TEST_SUITE(ABIEncoderTest, SolidityExecutionFramework)
+
+BOOST_AUTO_TEST_CASE(value_types)
+{
+ char const* sourceCode = R"(
+ contract C {
+ event E(uint a, uint16 b, uint24 c, int24 d, bytes3 x, bool, C);
+ function f() {
+ bytes6 x = hex"1bababababa2";
+ bool b;
+ assembly { b := 7 }
+ C c;
+ assembly { c := sub(0, 5) }
+ E(10, uint16(uint256(-2)), uint24(0x12121212), int24(int256(-1)), bytes3(x), b, c);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(
+ 10, u256(65534), u256(0x121212), u256(-1), string("\x1b\xab\xab"), true, u160(u256(-5))
+ ));
+}
+
+BOOST_AUTO_TEST_CASE(string_literal)
+{
+ char const* sourceCode = R"(
+ contract C {
+ event E(string, bytes20, string);
+ function f() {
+ E("abcdef", "abcde", "abcdefabcdefgehabcabcasdfjklabcdefabcedefghabcabcasdfjklabcdefabcdefghabcabcasdfjklabcdeefabcdefghabcabcasdefjklabcdefabcdefghabcabcasdfjkl");
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(
+ 0x60, string("abcde"), 0xa0,
+ 6, string("abcdef"),
+ 0x8b, string("abcdefabcdefgehabcabcasdfjklabcdefabcedefghabcabcasdfjklabcdefabcdefghabcabcasdfjklabcdeefabcdefghabcabcasdefjklabcdefabcdefghabcabcasdfjkl")
+ ));
+}
+
+
+BOOST_AUTO_TEST_CASE(enum_type_cleanup)
+{
+ char const* sourceCode = R"(
+ contract C {
+ enum E { A, B }
+ function f(uint x) returns (E en) {
+ assembly { en := x }
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("f(uint256)", 0) == encodeArgs(0));
+ BOOST_CHECK(callContractFunction("f(uint256)", 1) == encodeArgs(1));
+ BOOST_CHECK(callContractFunction("f(uint256)", 2) == encodeArgs());
+}
+
+BOOST_AUTO_TEST_CASE(conversion)
+{
+ char const* sourceCode = R"(
+ contract C {
+ event E(bytes4, bytes4, uint16, uint8, int16, int8);
+ function f() {
+ bytes2 x; assembly { x := 0xf1f2f3f400000000000000000000000000000000000000000000000000000000 }
+ uint8 a;
+ uint16 b = 0x1ff;
+ int8 c;
+ int16 d;
+ assembly { a := sub(0, 1) c := 0x0101ff d := 0xff01 }
+ E(10, x, a, uint8(b), c, int8(d));
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(
+ string(3, 0) + string("\x0a"), string("\xf1\xf2"),
+ 0xff, 0xff, u256(-1), u256(1)
+ ));
+}
+
+BOOST_AUTO_TEST_CASE(storage_byte_array)
+{
+ char const* sourceCode = R"(
+ contract C {
+ bytes short;
+ bytes long;
+ event E(bytes s, bytes l);
+ function f() {
+ short = "123456789012345678901234567890a";
+ long = "ffff123456789012345678901234567890afffffffff123456789012345678901234567890a";
+ E(short, long);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(
+ 0x40, 0x80,
+ 31, string("123456789012345678901234567890a"),
+ 75, string("ffff123456789012345678901234567890afffffffff123456789012345678901234567890a")
+ ));
+}
+
+BOOST_AUTO_TEST_CASE(storage_array)
+{
+ char const* sourceCode = R"(
+ contract C {
+ address[3] addr;
+ event E(address[3] a);
+ function f() {
+ assembly {
+ sstore(0, sub(0, 1))
+ sstore(1, sub(0, 2))
+ sstore(2, sub(0, 3))
+ }
+ E(addr);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(u160(-1), u160(-2), u160(-3)));
+}
+
+BOOST_AUTO_TEST_CASE(storage_array_dyn)
+{
+ char const* sourceCode = R"(
+ contract C {
+ address[] addr;
+ event E(address[] a);
+ function f() {
+ addr.push(1);
+ addr.push(2);
+ addr.push(3);
+ E(addr);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(0x20, 3, u160(1), u160(2), u160(3)));
+}
+
+BOOST_AUTO_TEST_CASE(storage_array_compact)
+{
+ char const* sourceCode = R"(
+ contract C {
+ int72[] x;
+ event E(int72[]);
+ function f() {
+ x.push(-1);
+ x.push(2);
+ x.push(-3);
+ x.push(4);
+ x.push(-5);
+ x.push(6);
+ x.push(-7);
+ x.push(8);
+ E(x);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f()");
+ REQUIRE_LOG_DATA(encodeArgs(
+ 0x20, 8, u256(-1), 2, u256(-3), 4, u256(-5), 6, u256(-7), 8
+ ));
+}
+
+BOOST_AUTO_TEST_CASE(external_function)
+{
+ char const* sourceCode = R"(
+ contract C {
+ event E(function(uint) external returns (uint), function(uint) external returns (uint));
+ function(uint) external returns (uint) g;
+ function f(uint) returns (uint) {
+ g = this.f;
+ E(this.f, g);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f(uint256)");
+ string functionIdF = asString(m_contractAddress.ref()) + asString(FixedHash<4>(dev::keccak256("f(uint256)")).ref());
+ REQUIRE_LOG_DATA(encodeArgs(functionIdF, functionIdF));
+}
+
+BOOST_AUTO_TEST_CASE(external_function_cleanup)
+{
+ char const* sourceCode = R"(
+ contract C {
+ event E(function(uint) external returns (uint), function(uint) external returns (uint));
+ // This test relies on the fact that g is stored in slot zero.
+ function(uint) external returns (uint) g;
+ function f(uint) returns (uint) {
+ function(uint) external returns (uint)[1] memory h;
+ assembly { sstore(0, sub(0, 1)) mstore(h, sub(0, 1)) }
+ E(h[0], g);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("f(uint256)");
+ REQUIRE_LOG_DATA(encodeArgs(string(24, char(-1)), string(24, char(-1))));
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}
+}
+} // end namespaces
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index 8b41e1db..df9afaae 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -49,7 +49,8 @@ public:
{
m_compiler.reset(false);
m_compiler.addSource("", "pragma solidity >=0.0;\n" + _sourceCode);
- ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(dev::test::Options::get().optimize), "Compiling contract failed");
+ m_compiler.setOptimiserSettings(dev::test::Options::get().optimize);
+ ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(), "Compiling contract failed");
AssemblyItems const* items = m_compiler.runtimeAssemblyItems("");
ASTNode const& sourceUnit = m_compiler.ast();
diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp
index 6aa96fb8..03287b28 100644
--- a/test/libsolidity/Imports.cpp
+++ b/test/libsolidity/Imports.cpp
@@ -20,11 +20,15 @@
* Tests for high level features like import.
*/
-#include <string>
-#include <boost/test/unit_test.hpp>
+#include <test/libsolidity/ErrorCheck.h>
+
#include <libsolidity/interface/Exceptions.h>
#include <libsolidity/interface/CompilerStack.h>
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+
using namespace std;
namespace dev
@@ -202,6 +206,68 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent)
BOOST_CHECK(d.compile());
}
+BOOST_AUTO_TEST_CASE(shadowing_via_import)
+{
+ CompilerStack c;
+ c.addSource("a", "library A {} pragma solidity >=0.0;");
+ c.addSource("b", "library A {} pragma solidity >=0.0;");
+ c.addSource("c", "import {A} from \"./a\"; import {A} from \"./b\";");
+ BOOST_CHECK(!c.compile());
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_imports)
+{
+ CompilerStack c;
+ c.addSource("B.sol", "contract X {} pragma solidity >=0.0;");
+ c.addSource("b", R"(
+ pragma solidity >=0.0;
+ import * as msg from "B.sol";
+ contract C {
+ }
+ )");
+ BOOST_CHECK(c.compile());
+ size_t errorCount = 0;
+ for (auto const& e: c.errors())
+ {
+ string const* msg = e->comment();
+ BOOST_REQUIRE(msg);
+ if (msg->find("pre-release") != string::npos)
+ continue;
+ BOOST_CHECK(
+ msg->find("shadows a builtin symbol") != string::npos
+ );
+ errorCount++;
+ }
+ BOOST_CHECK_EQUAL(errorCount, 1);
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_multiple_imports)
+{
+ CompilerStack c;
+ c.addSource("B.sol", "contract msg {} contract block{} pragma solidity >=0.0;");
+ c.addSource("b", R"(
+ pragma solidity >=0.0;
+ import {msg, block} from "B.sol";
+ contract C {
+ }
+ )");
+ BOOST_CHECK(c.compile());
+ auto numErrors = c.errors().size();
+ // Sometimes we get the prerelease warning, sometimes not.
+ BOOST_CHECK(4 <= numErrors && numErrors <= 5);
+ for (auto const& e: c.errors())
+ {
+ string const* msg = e->comment();
+ BOOST_REQUIRE(msg);
+ BOOST_CHECK(
+ msg->find("pre-release") != string::npos ||
+ msg->find("shadows a builtin symbol") != string::npos
+ );
+ }
+}
+
+
+
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/JSONCompiler.cpp b/test/libsolidity/JSONCompiler.cpp
index a6a7bc5b..536ba730 100644
--- a/test/libsolidity/JSONCompiler.cpp
+++ b/test/libsolidity/JSONCompiler.cpp
@@ -35,7 +35,10 @@ extern "C"
{
extern char const* version();
extern char const* license();
+extern char const* compileJSON(char const* _input, bool _optimize);
extern char const* compileJSONMulti(char const* _input, bool _optimize);
+extern char const* compileJSONCallback(char const* _input, bool _optimize, void* _readCallback);
+extern char const* compileStandard(char const* _input, void* _readCallback);
}
namespace dev
@@ -48,9 +51,29 @@ namespace test
namespace
{
+Json::Value compileSingle(string const& _input)
+{
+ string output(compileJSON(_input.c_str(), dev::test::Options::get().optimize));
+ Json::Value ret;
+ BOOST_REQUIRE(Json::Reader().parse(output, ret, false));
+ return ret;
+}
+
+Json::Value compileMulti(string const& _input, bool _callback)
+{
+ string output(
+ _callback ?
+ compileJSONCallback(_input.c_str(), dev::test::Options::get().optimize, NULL) :
+ compileJSONMulti(_input.c_str(), dev::test::Options::get().optimize)
+ );
+ Json::Value ret;
+ BOOST_REQUIRE(Json::Reader().parse(output, ret, false));
+ return ret;
+}
+
Json::Value compile(string const& _input)
{
- string output(compileJSONMulti(_input.c_str(), dev::test::Options::get().optimize));
+ string output(compileStandard(_input.c_str(), NULL));
Json::Value ret;
BOOST_REQUIRE(Json::Reader().parse(output, ret, false));
return ret;
@@ -81,8 +104,15 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
}
}
)";
- Json::Value result = compile(input);
+ Json::Value result = compileMulti(input, false);
BOOST_CHECK(result.isObject());
+
+ // Compare with compileJSONCallback
+ BOOST_CHECK_EQUAL(
+ dev::jsonCompactPrint(result),
+ dev::jsonCompactPrint(compileMulti(input, true))
+ );
+
BOOST_CHECK(result["contracts"].isObject());
BOOST_CHECK(result["contracts"]["fileA:A"].isObject());
Json::Value contract = result["contracts"]["fileA:A"];
@@ -119,6 +149,69 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
"\"src\":\"0:14:0\"}],\"id\":2,\"name\":\"SourceUnit\",\"src\":\"0:14:0\"}"
);
}
+
+BOOST_AUTO_TEST_CASE(single_compilation)
+{
+ Json::Value result = compileSingle("contract A { }");
+ BOOST_CHECK(result.isObject());
+
+ BOOST_CHECK(result["contracts"].isObject());
+ BOOST_CHECK(result["contracts"][":A"].isObject());
+ Json::Value contract = result["contracts"][":A"];
+ BOOST_CHECK(contract.isObject());
+ BOOST_CHECK(contract["interface"].isString());
+ BOOST_CHECK_EQUAL(contract["interface"].asString(), "[]");
+ BOOST_CHECK(contract["bytecode"].isString());
+ BOOST_CHECK_EQUAL(
+ dev::test::bytecodeSansMetadata(contract["bytecode"].asString()),
+ "60606040523415600e57600080fd5b5b603680601c6000396000f30060606040525b600080fd00"
+ );
+ BOOST_CHECK(contract["runtimeBytecode"].isString());
+ BOOST_CHECK_EQUAL(
+ dev::test::bytecodeSansMetadata(contract["runtimeBytecode"].asString()),
+ "60606040525b600080fd00"
+ );
+ BOOST_CHECK(contract["functionHashes"].isObject());
+ BOOST_CHECK(contract["gasEstimates"].isObject());
+ BOOST_CHECK_EQUAL(
+ dev::jsonCompactPrint(contract["gasEstimates"]),
+ "{\"creation\":[62,10800],\"external\":{},\"internal\":{}}"
+ );
+ BOOST_CHECK(contract["metadata"].isString());
+ BOOST_CHECK(dev::test::isValidMetadata(contract["metadata"].asString()));
+ BOOST_CHECK(result["sources"].isObject());
+ BOOST_CHECK(result["sources"][""].isObject());
+ BOOST_CHECK(result["sources"][""]["AST"].isObject());
+ BOOST_CHECK_EQUAL(
+ dev::jsonCompactPrint(result["sources"][""]["AST"]),
+ "{\"attributes\":{\"absolutePath\":\"\",\"exportedSymbols\":{\"A\":[1]}},"
+ "\"children\":[{\"attributes\":{\"baseContracts\":[null],\"contractDependencies\":[null],"
+ "\"contractKind\":\"contract\",\"documentation\":null,\"fullyImplemented\":true,\"linearizedBaseContracts\":[1],"
+ "\"name\":\"A\",\"nodes\":[null],\"scope\":2},\"id\":1,\"name\":\"ContractDefinition\","
+ "\"src\":\"0:14:0\"}],\"id\":2,\"name\":\"SourceUnit\",\"src\":\"0:14:0\"}"
+ );
+}
+
+BOOST_AUTO_TEST_CASE(standard_compilation)
+{
+ char const* input = R"(
+ {
+ "language": "Solidity",
+ "sources": {
+ "fileA": {
+ "content": "contract A { }"
+ }
+ }
+ }
+ )";
+ Json::Value result = compile(input);
+ BOOST_CHECK(result.isObject());
+
+ // Only tests some assumptions. The StandardCompiler is tested properly in another suite.
+ BOOST_CHECK(result.isMember("sources"));
+ BOOST_CHECK(result.isMember("contracts"));
+}
+
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index ce1a7b18..0d3caddd 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -44,7 +44,8 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
)";
CompilerStack compilerStack;
compilerStack.addSource("", std::string(sourceCode));
- ETH_TEST_REQUIRE_NO_THROW(compilerStack.compile(dev::test::Options::get().optimize), "Compiling contract failed");
+ compilerStack.setOptimiserSettings(dev::test::Options::get().optimize);
+ ETH_TEST_REQUIRE_NO_THROW(compilerStack.compile(), "Compiling contract failed");
bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
std::string const& metadata = compilerStack.metadata("test");
BOOST_CHECK(dev::test::isValidMetadata(metadata));
@@ -57,6 +58,75 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
BOOST_CHECK(std::equal(expectation.begin(), expectation.end(), bytecode.end() - metadataCBORSize - 2));
}
+BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
+{
+ CompilerStack compilerStack;
+ char const* sourceCode = R"(
+ pragma solidity >=0.0;
+ contract A {
+ function g(function(uint) external returns (uint) x) {}
+ }
+ )";
+ compilerStack.addSource("A", std::string(sourceCode));
+ sourceCode = R"(
+ pragma solidity >=0.0;
+ contract B {
+ function g(function(uint) external returns (uint) x) {}
+ }
+ )";
+ compilerStack.addSource("B", std::string(sourceCode));
+ compilerStack.setOptimiserSettings(dev::test::Options::get().optimize);
+ ETH_TEST_REQUIRE_NO_THROW(compilerStack.compile(), "Compiling contract failed");
+
+ std::string const& serialisedMetadata = compilerStack.metadata("A");
+ BOOST_CHECK(dev::test::isValidMetadata(serialisedMetadata));
+ Json::Value metadata;
+ BOOST_REQUIRE(Json::Reader().parse(serialisedMetadata, metadata, false));
+
+ BOOST_CHECK_EQUAL(metadata["sources"].size(), 1);
+ BOOST_CHECK(metadata["sources"].isMember("A"));
+}
+
+BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
+{
+ CompilerStack compilerStack;
+ char const* sourceCode = R"(
+ pragma solidity >=0.0;
+ contract A {
+ function g(function(uint) external returns (uint) x) {}
+ }
+ )";
+ compilerStack.addSource("A", std::string(sourceCode));
+ sourceCode = R"(
+ pragma solidity >=0.0;
+ import "./A";
+ contract B is A {
+ function g(function(uint) external returns (uint) x) {}
+ }
+ )";
+ compilerStack.addSource("B", std::string(sourceCode));
+ sourceCode = R"(
+ pragma solidity >=0.0;
+ import "./B";
+ contract C is B {
+ function g(function(uint) external returns (uint) x) {}
+ }
+ )";
+ compilerStack.addSource("C", std::string(sourceCode));
+ compilerStack.setOptimiserSettings(dev::test::Options::get().optimize);
+ ETH_TEST_REQUIRE_NO_THROW(compilerStack.compile(), "Compiling contract failed");
+
+ std::string const& serialisedMetadata = compilerStack.metadata("C");
+ BOOST_CHECK(dev::test::isValidMetadata(serialisedMetadata));
+ Json::Value metadata;
+ BOOST_REQUIRE(Json::Reader().parse(serialisedMetadata, metadata, false));
+
+ BOOST_CHECK_EQUAL(metadata["sources"].size(), 3);
+ BOOST_CHECK(metadata["sources"].isMember("A"));
+ BOOST_CHECK(metadata["sources"].isMember("B"));
+ BOOST_CHECK(metadata["sources"].isMember("C"));
+}
+
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 94d3e168..166c4660 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1950,6 +1950,87 @@ BOOST_AUTO_TEST_CASE(ripemd)
testContractAgainstCpp("a(bytes32)", f, u256(-1));
}
+BOOST_AUTO_TEST_CASE(packed_keccak256)
+{
+ char const* sourceCode = R"(
+ contract test {
+ function a(bytes32 input) returns (bytes32 hash) {
+ var b = 65536;
+ uint c = 256;
+ return keccak256(8, input, b, input, c);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ auto f = [&](u256 const& _x) -> u256
+ {
+ return dev::keccak256(
+ toCompactBigEndian(unsigned(8)) +
+ toBigEndian(_x) +
+ toCompactBigEndian(unsigned(65536)) +
+ toBigEndian(_x) +
+ toBigEndian(u256(256))
+ );
+ };
+ testContractAgainstCpp("a(bytes32)", f, u256(4));
+ testContractAgainstCpp("a(bytes32)", f, u256(5));
+ testContractAgainstCpp("a(bytes32)", f, u256(-1));
+}
+
+BOOST_AUTO_TEST_CASE(packed_sha256)
+{
+ char const* sourceCode = R"(
+ contract test {
+ function a(bytes32 input) returns (bytes32 hash) {
+ var b = 65536;
+ uint c = 256;
+ return sha256(8, input, b, input, c);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ auto f = [&](u256 const& _x) -> bytes
+ {
+ if (_x == u256(4))
+ return fromHex("804e0d7003cfd70fc925dc103174d9f898ebb142ecc2a286da1abd22ac2ce3ac");
+ if (_x == u256(5))
+ return fromHex("e94921945f9068726c529a290a954f412bcac53184bb41224208a31edbf63cf0");
+ if (_x == u256(-1))
+ return fromHex("f14def4d07cd185ddd8b10a81b2238326196a38867e6e6adbcc956dc913488c7");
+ return fromHex("");
+ };
+ testContractAgainstCpp("a(bytes32)", f, u256(4));
+ testContractAgainstCpp("a(bytes32)", f, u256(5));
+ testContractAgainstCpp("a(bytes32)", f, u256(-1));
+}
+
+BOOST_AUTO_TEST_CASE(packed_ripemd160)
+{
+ char const* sourceCode = R"(
+ contract test {
+ function a(bytes32 input) returns (bytes32 hash) {
+ var b = 65536;
+ uint c = 256;
+ return ripemd160(8, input, b, input, c);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ auto f = [&](u256 const& _x) -> bytes
+ {
+ if (_x == u256(4))
+ return fromHex("f93175303eba2a7b372174fc9330237f5ad202fc000000000000000000000000");
+ if (_x == u256(5))
+ return fromHex("04f4fc112e2bfbe0d38f896a46629e08e2fcfad5000000000000000000000000");
+ if (_x == u256(-1))
+ return fromHex("c0a2e4b1f3ff766a9a0089e7a410391730872495000000000000000000000000");
+ return fromHex("");
+ };
+ testContractAgainstCpp("a(bytes32)", f, u256(4));
+ testContractAgainstCpp("a(bytes32)", f, u256(5));
+ testContractAgainstCpp("a(bytes32)", f, u256(-1));
+}
+
BOOST_AUTO_TEST_CASE(ecrecover)
{
char const* sourceCode = R"(
@@ -2318,21 +2399,6 @@ BOOST_AUTO_TEST_CASE(gas_and_value_basic)
BOOST_REQUIRE(callContractFunction("checkState()") == encodeArgs(false, 20 - 5));
}
-BOOST_AUTO_TEST_CASE(gas_for_builtin)
-{
- char const* sourceCode = R"(
- contract Contract {
- function test(uint g) returns (bytes32 data, bool flag) {
- data = ripemd160.gas(g)("abc");
- flag = true;
- }
- }
- )";
- compileAndRun(sourceCode);
- BOOST_CHECK(callContractFunction("test(uint256)", 500) == bytes());
- BOOST_CHECK(callContractFunction("test(uint256)", 800) == encodeArgs(u256("0x8eb208f7e05d987a9b044a8e98c6b087f15a0bfc000000000000000000000000"), true));
-}
-
BOOST_AUTO_TEST_CASE(value_complex)
{
char const* sourceCode = R"(
@@ -2696,6 +2762,34 @@ BOOST_AUTO_TEST_CASE(function_modifier_for_constructor)
BOOST_CHECK(callContractFunction("getData()") == encodeArgs(4 | 2));
}
+BOOST_AUTO_TEST_CASE(function_modifier_multiple_times)
+{
+ char const* sourceCode = R"(
+ contract C {
+ uint public a;
+ modifier mod(uint x) { a += x; _; }
+ function f(uint x) mod(2) mod(5) mod(x) returns(uint) { return a; }
+ }
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("f(uint256)", u256(3)) == encodeArgs(2 + 5 + 3));
+ BOOST_CHECK(callContractFunction("a()") == encodeArgs(2 + 5 + 3));
+}
+
+BOOST_AUTO_TEST_CASE(function_modifier_multiple_times_local_vars)
+{
+ char const* sourceCode = R"(
+ contract C {
+ uint public a;
+ modifier mod(uint x) { uint b = x; a += b; _; a -= b; assert(b == x); }
+ function f(uint x) mod(2) mod(5) mod(x) returns(uint) { return a; }
+ }
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("f(uint256)", u256(3)) == encodeArgs(2 + 5 + 3));
+ BOOST_CHECK(callContractFunction("a()") == encodeArgs(0));
+}
+
BOOST_AUTO_TEST_CASE(crazy_elementary_typenames_on_stack)
{
char const* sourceCode = R"(
@@ -3063,6 +3157,31 @@ BOOST_AUTO_TEST_CASE(event_really_lots_of_data_from_storage)
BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::keccak256(string("Deposit(uint256,bytes,uint256)")));
}
+BOOST_AUTO_TEST_CASE(event_really_really_lots_of_data_from_storage)
+{
+ char const* sourceCode = R"(
+ contract ClientReceipt {
+ bytes x;
+ event Deposit(uint fixeda, bytes dynx, uint fixedb);
+ function deposit() {
+ x.length = 31;
+ x[0] = "A";
+ x[1] = "B";
+ x[2] = "C";
+ x[30] = "Z";
+ Deposit(10, x, 15);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("deposit()");
+ BOOST_REQUIRE_EQUAL(m_logs.size(), 1);
+ BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress);
+ BOOST_CHECK(m_logs[0].data == encodeArgs(10, 0x60, 15, 31, string("ABC") + string(27, 0) + "Z"));
+ BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 1);
+ BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::keccak256(string("Deposit(uint256,bytes,uint256)")));
+}
+
BOOST_AUTO_TEST_CASE(event_indexed_string)
{
char const* sourceCode = R"(
@@ -4308,6 +4427,75 @@ BOOST_AUTO_TEST_CASE(array_copy_storage_storage_struct)
BOOST_CHECK(storageEmpty(m_contractAddress));
}
+BOOST_AUTO_TEST_CASE(array_copy_storage_abi)
+{
+ // NOTE: This does not really test copying from storage to ABI directly,
+ // because it will always copy to memory first.
+ char const* sourceCode = R"(
+ contract c {
+ uint8[] x;
+ uint16[] y;
+ uint24[] z;
+ function test1() returns (uint8[]) {
+ for (uint i = 0; i < 101; ++i)
+ x.push(uint8(i));
+ return x;
+ }
+ function test2() returns (uint16[]) {
+ for (uint i = 0; i < 101; ++i)
+ y.push(uint16(i));
+ return y;
+ }
+ function test3() returns (uint24[]) {
+ for (uint i = 0; i < 101; ++i)
+ z.push(uint24(i));
+ return z;
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ bytes valueSequence;
+ for (size_t i = 0; i < 101; ++i)
+ valueSequence += toBigEndian(u256(i));
+ BOOST_CHECK(callContractFunction("test1()") == encodeArgs(0x20, 101) + valueSequence);
+ BOOST_CHECK(callContractFunction("test2()") == encodeArgs(0x20, 101) + valueSequence);
+ BOOST_CHECK(callContractFunction("test3()") == encodeArgs(0x20, 101) + valueSequence);
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_storage_abi_signed)
+{
+ // NOTE: This does not really test copying from storage to ABI directly,
+ // because it will always copy to memory first.
+ char const* sourceCode = R"(
+ contract c {
+ int16[] x;
+ function test() returns (int16[]) {
+ x.push(int16(-1));
+ x.push(int16(-1));
+ x.push(int16(8));
+ x.push(int16(-16));
+ x.push(int16(-2));
+ x.push(int16(6));
+ x.push(int16(8));
+ x.push(int16(-1));
+ return x;
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ bytes valueSequence;
+ BOOST_CHECK(callContractFunction("test()") == encodeArgs(0x20, 8,
+ u256(-1),
+ u256(-1),
+ u256(8),
+ u256(-16),
+ u256(-2),
+ u256(6),
+ u256(8),
+ u256(-1)
+ ));
+}
+
BOOST_AUTO_TEST_CASE(array_push)
{
char const* sourceCode = R"(
@@ -8223,6 +8411,53 @@ BOOST_AUTO_TEST_CASE(failing_ecrecover_invalid_input)
BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(0)));
}
+BOOST_AUTO_TEST_CASE(failing_ecrecover_invalid_input_proper)
+{
+ char const* sourceCode = R"(
+ contract C {
+ function f() returns (address) {
+ return recover(
+ 0x77e5189111eb6557e8a637b27ef8fbb15bc61d61c2f00cc48878f3a296e5e0ca,
+ 0, // invalid v value
+ 0x6944c77849b18048f6abe0db8084b0d0d0689cdddb53d2671c36967b58691ad4,
+ 0xef4f06ba4f78319baafd0424365777241af4dfd3da840471b4b4b087b7750d0d,
+ 0xca35b7d915458ef540ade6068dfe2f44e8fa733c,
+ 0xca35b7d915458ef540ade6068dfe2f44e8fa733c
+ );
+ }
+ function recover(bytes32 hash, uint8 v, bytes32 r, bytes32 s, uint blockExpired, bytes32 salt)
+ returns (address)
+ {
+ require(hash == keccak256(blockExpired, salt));
+ return ecrecover(hash, v, r, s);
+ }
+ }
+ )";
+ compileAndRun(sourceCode, 0, "C");
+ BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(0)));
+}
+
+BOOST_AUTO_TEST_CASE(failing_ecrecover_invalid_input_asm)
+{
+ char const* sourceCode = R"(
+ contract C {
+ function f() returns (address) {
+ assembly {
+ mstore(mload(0x40), 0xca35b7d915458ef540ade6068dfe2f44e8fa733c)
+ }
+ return ecrecover(
+ 0x77e5189111eb6557e8a637b27ef8fbb15bc61d61c2f00cc48878f3a296e5e0ca,
+ 0, // invalid v value
+ 0x6944c77849b18048f6abe0db8084b0d0d0689cdddb53d2671c36967b58691ad4,
+ 0xef4f06ba4f78319baafd0424365777241af4dfd3da840471b4b4b087b7750d0d
+ );
+ }
+ }
+ )";
+ compileAndRun(sourceCode, 0, "C");
+ BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(0)));
+}
+
BOOST_AUTO_TEST_CASE(calling_nonexisting_contract_throws)
{
char const* sourceCode = R"(
@@ -9741,6 +9976,64 @@ BOOST_AUTO_TEST_CASE(inlineasm_empty_let)
BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(0), u256(0)));
}
+BOOST_AUTO_TEST_CASE(bare_call_invalid_address)
+{
+ char const* sourceCode = R"(
+ contract C {
+ /// Calling into non-existant account is successful (creates the account)
+ function f() external constant returns (bool) {
+ return address(0x4242).call();
+ }
+ function g() external constant returns (bool) {
+ return address(0x4242).callcode();
+ }
+ function h() external constant returns (bool) {
+ return address(0x4242).delegatecall();
+ }
+ }
+ )";
+ compileAndRun(sourceCode, 0, "C");
+ BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(1)));
+ BOOST_CHECK(callContractFunction("g()") == encodeArgs(u256(1)));
+ BOOST_CHECK(callContractFunction("h()") == encodeArgs(u256(1)));
+}
+
+BOOST_AUTO_TEST_CASE(delegatecall_return_value)
+{
+ char const* sourceCode = R"DELIMITER(
+ contract C {
+ uint value;
+ function set(uint _value) external {
+ value = _value;
+ }
+ function get() external constant returns (uint) {
+ return value;
+ }
+ function get_delegated() external constant returns (bool) {
+ return this.delegatecall(bytes4(sha3("get()")));
+ }
+ function assert0() external constant {
+ assert(value == 0);
+ }
+ function assert0_delegated() external constant returns (bool) {
+ return this.delegatecall(bytes4(sha3("assert0()")));
+ }
+ }
+ )DELIMITER";
+ compileAndRun(sourceCode, 0, "C");
+ BOOST_CHECK(callContractFunction("get()") == encodeArgs(u256(0)));
+ BOOST_CHECK(callContractFunction("assert0_delegated()") == encodeArgs(u256(1)));
+ BOOST_CHECK(callContractFunction("get_delegated()") == encodeArgs(u256(1)));
+ BOOST_CHECK(callContractFunction("set(uint256)", u256(1)) == encodeArgs());
+ BOOST_CHECK(callContractFunction("get()") == encodeArgs(u256(1)));
+ BOOST_CHECK(callContractFunction("assert0_delegated()") == encodeArgs(u256(0)));
+ BOOST_CHECK(callContractFunction("get_delegated()") == encodeArgs(u256(1)));
+ BOOST_CHECK(callContractFunction("set(uint256)", u256(42)) == encodeArgs());
+ BOOST_CHECK(callContractFunction("get()") == encodeArgs(u256(42)));
+ BOOST_CHECK(callContractFunction("assert0_delegated()") == encodeArgs(u256(0)));
+ BOOST_CHECK(callContractFunction("get_delegated()") == encodeArgs(u256(1)));
+}
+
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index 03e3a881..a8e58c25 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -56,7 +56,9 @@ public:
std::string sourceCode = "pragma solidity >=0.0;\n" + _sourceCode;
m_compiler.reset(false);
m_compiler.addSource("", sourceCode);
- if (!m_compiler.compile(m_optimize, m_optimizeRuns, _libraryAddresses))
+ m_compiler.setLibraries(_libraryAddresses);
+ m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns);
+ if (!m_compiler.compile())
{
for (auto const& error: m_compiler.errors())
SourceReferenceFormatter::printExceptionInformation(
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 4b29243a..55ce5f7b 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -624,7 +624,7 @@ BOOST_AUTO_TEST_CASE(function_no_implementation)
std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
ContractDefinition* contract = dynamic_cast<ContractDefinition*>(nodes[1].get());
BOOST_REQUIRE(contract);
- BOOST_CHECK(!contract->annotation().isFullyImplemented);
+ BOOST_CHECK(!contract->annotation().unimplementedFunctions.empty());
BOOST_CHECK(!contract->definedFunctions()[0]->isImplemented());
}
@@ -640,10 +640,10 @@ BOOST_AUTO_TEST_CASE(abstract_contract)
ContractDefinition* base = dynamic_cast<ContractDefinition*>(nodes[1].get());
ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
BOOST_REQUIRE(base);
- BOOST_CHECK(!base->annotation().isFullyImplemented);
+ BOOST_CHECK(!base->annotation().unimplementedFunctions.empty());
BOOST_CHECK(!base->definedFunctions()[0]->isImplemented());
BOOST_REQUIRE(derived);
- BOOST_CHECK(derived->annotation().isFullyImplemented);
+ BOOST_CHECK(derived->annotation().unimplementedFunctions.empty());
BOOST_CHECK(derived->definedFunctions()[0]->isImplemented());
}
@@ -659,9 +659,9 @@ BOOST_AUTO_TEST_CASE(abstract_contract_with_overload)
ContractDefinition* base = dynamic_cast<ContractDefinition*>(nodes[1].get());
ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
BOOST_REQUIRE(base);
- BOOST_CHECK(!base->annotation().isFullyImplemented);
+ BOOST_CHECK(!base->annotation().unimplementedFunctions.empty());
BOOST_REQUIRE(derived);
- BOOST_CHECK(!derived->annotation().isFullyImplemented);
+ BOOST_CHECK(!derived->annotation().unimplementedFunctions.empty());
}
BOOST_AUTO_TEST_CASE(create_abstract_contract)
@@ -677,44 +677,6 @@ BOOST_AUTO_TEST_CASE(create_abstract_contract)
CHECK_ERROR(text, TypeError, "");
}
-BOOST_AUTO_TEST_CASE(abstract_contract_constructor_args_optional)
-{
- ASTPointer<SourceUnit> sourceUnit;
- char const* text = R"(
- contract BaseBase { function BaseBase(uint j); }
- contract base is BaseBase { function foo(); }
- contract derived is base {
- function derived(uint i) BaseBase(i){}
- function foo() {}
- }
- )";
- ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseAndAnalyse(text), "Parsing and name resolving failed");
- std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
- BOOST_CHECK_EQUAL(nodes.size(), 4);
- ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[3].get());
- BOOST_REQUIRE(derived);
- BOOST_CHECK(!derived->annotation().isFullyImplemented);
-}
-
-BOOST_AUTO_TEST_CASE(abstract_contract_constructor_args_not_provided)
-{
- ASTPointer<SourceUnit> sourceUnit;
- char const* text = R"(
- contract BaseBase { function BaseBase(uint); }
- contract base is BaseBase { function foo(); }
- contract derived is base {
- function derived(uint) {}
- function foo() {}
- }
- )";
- ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseAndAnalyse(text), "Parsing and name resolving failed");
- std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
- BOOST_CHECK_EQUAL(nodes.size(), 4);
- ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[3].get());
- BOOST_REQUIRE(derived);
- BOOST_CHECK(!derived->annotation().isFullyImplemented);
-}
-
BOOST_AUTO_TEST_CASE(redeclare_implemented_abstract_function_as_abstract)
{
ASTPointer<SourceUnit> sourceUnit;
@@ -738,7 +700,7 @@ BOOST_AUTO_TEST_CASE(implement_abstract_via_constructor)
BOOST_CHECK_EQUAL(nodes.size(), 3);
ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
BOOST_REQUIRE(derived);
- BOOST_CHECK(!derived->annotation().isFullyImplemented);
+ BOOST_CHECK(!derived->annotation().unimplementedFunctions.empty());
}
BOOST_AUTO_TEST_CASE(function_canonical_signature)
@@ -1115,7 +1077,7 @@ BOOST_AUTO_TEST_CASE(function_modifier_double_invocation)
modifier mod(uint a) { if (a > 0) _; }
}
)";
- CHECK_ERROR(text, DeclarationError, "Modifier already used for this function");
+ success(text);
}
BOOST_AUTO_TEST_CASE(base_constructor_double_invocation)
@@ -5498,22 +5460,6 @@ BOOST_AUTO_TEST_CASE(does_not_warn_msg_value_in_library)
CHECK_SUCCESS_NO_WARNINGS(text);
}
-BOOST_AUTO_TEST_CASE(does_not_warn_non_magic_msg_value)
-{
- char const* text = R"(
- contract C {
- struct msg {
- uint256 value;
- }
-
- function f() {
- msg.value;
- }
- }
- )";
- CHECK_SUCCESS_NO_WARNINGS(text);
-}
-
BOOST_AUTO_TEST_CASE(does_not_warn_msg_value_in_modifier_following_non_payable_public_function)
{
char const* text = R"(
@@ -5730,7 +5676,7 @@ BOOST_AUTO_TEST_CASE(interface_constructor)
function I();
}
)";
- CHECK_ERROR(text, TypeError, "Constructor cannot be defined in interfaces");
+ CHECK_ERROR_ALLOW_MULTI(text, TypeError, "Constructor cannot be defined in interfaces");
}
BOOST_AUTO_TEST_CASE(interface_functions)
@@ -6127,6 +6073,126 @@ BOOST_AUTO_TEST_CASE(no_unused_inline_asm)
CHECK_SUCCESS_NO_WARNINGS(text);
}
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_functions)
+{
+ char const* text = R"(
+ contract C {
+ function keccak256() {}
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_variables)
+{
+ char const* text = R"(
+ contract C {
+ function f() {
+ uint msg;
+ msg;
+ }
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_storage_variables)
+{
+ char const* text = R"(
+ contract C {
+ uint msg;
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtin_at_global_scope)
+{
+ char const* text = R"(
+ contract msg {
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_parameters)
+{
+ char const* text = R"(
+ contract C {
+ function f(uint require) {
+ require = 2;
+ }
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_return_parameters)
+{
+ char const* text = R"(
+ contract C {
+ function f() returns (uint require) {
+ require = 2;
+ }
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_events)
+{
+ char const* text = R"(
+ contract C {
+ event keccak256();
+ }
+ )";
+ CHECK_WARNING(text, "shadows a builtin symbol");
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_ignores_struct)
+{
+ char const* text = R"(
+ contract C {
+ struct a {
+ uint msg;
+ }
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(shadowing_builtins_ignores_constructor)
+{
+ char const* text = R"(
+ contract C {
+ function C() {}
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(function_overload_is_not_shadowing)
+{
+ char const* text = R"(
+ contract C {
+ function f() {}
+ function f(uint) {}
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(function_override_is_not_shadowing)
+{
+ char const* text = R"(
+ contract D { function f() {} }
+ contract C is D {
+ function f(uint) {}
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
BOOST_AUTO_TEST_CASE(callable_crash)
{
char const* text = R"(
@@ -6245,14 +6311,6 @@ BOOST_AUTO_TEST_CASE(create2_as_variable)
CHECK_WARNING_ALLOW_MULTI(text, "Variable is shadowed in inline assembly by an instruction of the same name");
}
-BOOST_AUTO_TEST_CASE(shadowing_warning_can_be_removed)
-{
- char const* text = R"(
- contract C {function f() {assembly {}}}
- )";
- CHECK_SUCCESS_NO_WARNINGS(text);
-}
-
BOOST_AUTO_TEST_CASE(warn_unspecified_storage)
{
char const* text = R"(
@@ -6382,6 +6440,161 @@ BOOST_AUTO_TEST_CASE(using_this_in_constructor)
CHECK_WARNING(text, "\"this\" used in constructor");
}
+BOOST_AUTO_TEST_CASE(do_not_crash_on_not_lvalue)
+{
+ // This checks for a bug that caused a crash because of continued analysis.
+ char const* text = R"(
+ contract C {
+ mapping (uint => uint) m;
+ function f() {
+ m(1) = 2;
+ }
+ }
+ )";
+ CHECK_ERROR_ALLOW_MULTI(text, TypeError, "is not callable");
+}
+
+BOOST_AUTO_TEST_CASE(builtin_reject_gas)
+{
+ char const* text = R"(
+ contract C {
+ function f() {
+ keccak256.gas();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"gas\" not found or not visible after argument-dependent lookup");
+ text = R"(
+ contract C {
+ function f() {
+ sha256.gas();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"gas\" not found or not visible after argument-dependent lookup");
+ text = R"(
+ contract C {
+ function f() {
+ ripemd160.gas();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"gas\" not found or not visible after argument-dependent lookup");
+ text = R"(
+ contract C {
+ function f() {
+ ecrecover.gas();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"gas\" not found or not visible after argument-dependent lookup");
+}
+
+BOOST_AUTO_TEST_CASE(builtin_reject_value)
+{
+ char const* text = R"(
+ contract C {
+ function f() {
+ keccak256.value();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"value\" not found or not visible after argument-dependent lookup");
+ text = R"(
+ contract C {
+ function f() {
+ sha256.value();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"value\" not found or not visible after argument-dependent lookup");
+ text = R"(
+ contract C {
+ function f() {
+ ripemd160.value();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"value\" not found or not visible after argument-dependent lookup");
+ text = R"(
+ contract C {
+ function f() {
+ ecrecover.value();
+ }
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Member \"value\" not found or not visible after argument-dependent lookup");
+}
+
+BOOST_AUTO_TEST_CASE(constructor_without_implementation)
+{
+ char const* text = R"(
+ contract C {
+ function C();
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Constructor must be implemented if declared.");
+}
+
+BOOST_AUTO_TEST_CASE(library_function_without_implementation)
+{
+ char const* text = R"(
+ library L {
+ function f();
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+ text = R"(
+ library L {
+ function f() internal;
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Internal library function must be implemented if declared.");
+ text = R"(
+ library L {
+ function f() private;
+ }
+ )";
+ CHECK_ERROR(text, TypeError, "Internal library function must be implemented if declared.");
+}
+
+BOOST_AUTO_TEST_CASE(experimental_pragma)
+{
+ char const* text = R"(
+ pragma experimental;
+ )";
+ CHECK_ERROR(text, SyntaxError, "Experimental feature name is missing.");
+ text = R"(
+ pragma experimental 123;
+ )";
+ CHECK_ERROR(text, SyntaxError, "Unsupported experimental feature name.");
+ text = R"(
+ pragma experimental unsupportedName;
+ )";
+ CHECK_ERROR(text, SyntaxError, "Unsupported experimental feature name.");
+ text = R"(
+ pragma experimental "unsupportedName";
+ )";
+ CHECK_ERROR(text, SyntaxError, "Unsupported experimental feature name.");
+ text = R"(
+ pragma experimental "";
+ )";
+ CHECK_ERROR(text, SyntaxError, "Empty experimental feature name is invalid.");
+ text = R"(
+ pragma experimental unsupportedName unsupportedName;
+ )";
+ CHECK_ERROR(text, SyntaxError, "Stray arguments.");
+// text = R"(
+// pragma experimental supportedName;
+// )";
+// CHECK_WARNING(text, "Experimental features are turned on. Do not use experimental features on live deployments.");
+// text = R"(
+// pragma experimental supportedName;
+// pragma experimental supportedName;
+// )";
+// CHECK_ERROR(text, SyntaxError, "Duplicate experimental feature name.");
+}
+
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index aa343561..be20a9f2 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -65,7 +65,9 @@ public:
void expectNatspecError(std::string const& _code)
{
- BOOST_CHECK(!m_compilerStack.parseAndAnalyze(_code));
+ m_compilerStack.reset(false);
+ m_compilerStack.addSource("", "pragma solidity >=0.0;\n" + _code);
+ BOOST_CHECK(!m_compilerStack.parseAndAnalyze());
BOOST_REQUIRE(Error::containsErrorOfType(m_compilerStack.errors(), Error::Type::DocstringParsingError));
}
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index a4d80c99..bd635c33 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -22,11 +22,7 @@
#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmasm/PeepholeOptimiser.h>
-#include <libevmasm/ControlFlowGraph.h>
-#include <libevmasm/Assembly.h>
-#include <libevmasm/BlockDeduplicator.h>
+#include <libevmasm/Instruction.h>
#include <boost/test/unit_test.hpp>
#include <boost/lexical_cast.hpp>
@@ -106,71 +102,6 @@ public:
"\nOptimized: " + toHex(optimizedOutput));
}
- AssemblyItems addDummyLocations(AssemblyItems const& _input)
- {
- // add dummy locations to each item so that we can check that they are not deleted
- AssemblyItems input = _input;
- for (AssemblyItem& item: input)
- item.setLocation(SourceLocation(1, 3, make_shared<string>("")));
- return input;
- }
-
- eth::KnownState createInitialState(AssemblyItems const& _input)
- {
- eth::KnownState state;
- for (auto const& item: addDummyLocations(_input))
- state.feedItem(item, true);
- return state;
- }
-
- AssemblyItems CSE(AssemblyItems const& _input, eth::KnownState const& _state = eth::KnownState())
- {
- AssemblyItems input = addDummyLocations(_input);
-
- eth::CommonSubexpressionEliminator cse(_state);
- BOOST_REQUIRE(cse.feedItems(input.begin(), input.end()) == input.end());
- AssemblyItems output = cse.getOptimizedItems();
-
- for (AssemblyItem const& item: output)
- {
- BOOST_CHECK(item == Instruction::POP || !item.location().isEmpty());
- }
- return output;
- }
-
- void checkCSE(
- AssemblyItems const& _input,
- AssemblyItems const& _expectation,
- KnownState const& _state = eth::KnownState()
- )
- {
- AssemblyItems output = CSE(_input, _state);
- BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
- }
-
- AssemblyItems CFG(AssemblyItems const& _input)
- {
- AssemblyItems output = _input;
- // Running it four times should be enough for these tests.
- for (unsigned i = 0; i < 4; ++i)
- {
- ControlFlowGraph cfg(output);
- AssemblyItems optItems;
- for (BasicBlock const& block: cfg.optimisedBlocks())
- copy(output.begin() + block.begin, output.begin() + block.end,
- back_inserter(optItems));
- output = move(optItems);
- }
- return output;
- }
-
- void checkCFG(AssemblyItems const& _input, AssemblyItems const& _expectation)
- {
- AssemblyItems output = CFG(_input);
- BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
- }
-
-protected:
/// @returns the number of intructions in the given bytecode, not taking the metadata hash
/// into account.
size_t numInstructions(bytes const& _bytecode)
@@ -187,6 +118,7 @@ protected:
return instructions;
}
+protected:
Address m_optimizedContract;
Address m_nonOptimizedContract;
};
@@ -434,734 +366,6 @@ BOOST_AUTO_TEST_CASE(sequence_number_for_calls)
compareVersions("f(string,string)", 0x40, 0x80, 3, "abc", 3, "def");
}
-BOOST_AUTO_TEST_CASE(cse_intermediate_swap)
-{
- eth::KnownState state;
- eth::CommonSubexpressionEliminator cse(state);
- AssemblyItems input{
- Instruction::SWAP1, Instruction::POP, Instruction::ADD, u256(0), Instruction::SWAP1,
- Instruction::SLOAD, Instruction::SWAP1, u256(100), Instruction::EXP, Instruction::SWAP1,
- Instruction::DIV, u256(0xff), Instruction::AND
- };
- BOOST_REQUIRE(cse.feedItems(input.begin(), input.end()) == input.end());
- AssemblyItems output = cse.getOptimizedItems();
- BOOST_CHECK(!output.empty());
-}
-
-BOOST_AUTO_TEST_CASE(cse_negative_stack_access)
-{
- AssemblyItems input{Instruction::DUP2, u256(0)};
- checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_negative_stack_end)
-{
- AssemblyItems input{Instruction::ADD};
- checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_intermediate_negative_stack)
-{
- AssemblyItems input{Instruction::ADD, u256(1), Instruction::DUP1};
- checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_pop)
-{
- checkCSE({Instruction::POP}, {Instruction::POP});
-}
-
-BOOST_AUTO_TEST_CASE(cse_unneeded_items)
-{
- AssemblyItems input{
- Instruction::ADD,
- Instruction::SWAP1,
- Instruction::POP,
- u256(7),
- u256(8),
- };
- checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_constant_addition)
-{
- AssemblyItems input{u256(7), u256(8), Instruction::ADD};
- checkCSE(input, {u256(7 + 8)});
-}
-
-BOOST_AUTO_TEST_CASE(cse_invariants)
-{
- AssemblyItems input{
- Instruction::DUP1,
- Instruction::DUP1,
- u256(0),
- Instruction::OR,
- Instruction::OR
- };
- checkCSE(input, {Instruction::DUP1});
-}
-
-BOOST_AUTO_TEST_CASE(cse_subself)
-{
- checkCSE({Instruction::DUP1, Instruction::SUB}, {Instruction::POP, u256(0)});
-}
-
-BOOST_AUTO_TEST_CASE(cse_subother)
-{
- checkCSE({Instruction::SUB}, {Instruction::SUB});
-}
-
-BOOST_AUTO_TEST_CASE(cse_double_negation)
-{
- checkCSE({Instruction::DUP5, Instruction::NOT, Instruction::NOT}, {Instruction::DUP5});
-}
-
-BOOST_AUTO_TEST_CASE(cse_double_iszero)
-{
- checkCSE({Instruction::GT, Instruction::ISZERO, Instruction::ISZERO}, {Instruction::GT});
- checkCSE({Instruction::GT, Instruction::ISZERO}, {Instruction::GT, Instruction::ISZERO});
- checkCSE(
- {Instruction::ISZERO, Instruction::ISZERO, Instruction::ISZERO},
- {Instruction::ISZERO}
- );
-}
-
-BOOST_AUTO_TEST_CASE(cse_associativity)
-{
- AssemblyItems input{
- Instruction::DUP1,
- Instruction::DUP1,
- u256(0),
- Instruction::OR,
- Instruction::OR
- };
- checkCSE(input, {Instruction::DUP1});
-}
-
-BOOST_AUTO_TEST_CASE(cse_associativity2)
-{
- AssemblyItems input{
- u256(0),
- Instruction::DUP2,
- u256(2),
- u256(1),
- Instruction::DUP6,
- Instruction::ADD,
- u256(2),
- Instruction::ADD,
- Instruction::ADD,
- Instruction::ADD,
- Instruction::ADD
- };
- checkCSE(input, {Instruction::DUP2, Instruction::DUP2, Instruction::ADD, u256(5), Instruction::ADD});
-}
-
-BOOST_AUTO_TEST_CASE(cse_storage)
-{
- AssemblyItems input{
- u256(0),
- Instruction::SLOAD,
- u256(0),
- Instruction::SLOAD,
- Instruction::ADD,
- u256(0),
- Instruction::SSTORE
- };
- checkCSE(input, {
- u256(0),
- Instruction::DUP1,
- Instruction::SLOAD,
- Instruction::DUP1,
- Instruction::ADD,
- Instruction::SWAP1,
- Instruction::SSTORE
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_noninterleaved_storage)
-{
- // two stores to the same location should be replaced by only one store, even if we
- // read in the meantime
- AssemblyItems input{
- u256(7),
- Instruction::DUP2,
- Instruction::SSTORE,
- Instruction::DUP1,
- Instruction::SLOAD,
- u256(8),
- Instruction::DUP3,
- Instruction::SSTORE
- };
- checkCSE(input, {
- u256(8),
- Instruction::DUP2,
- Instruction::SSTORE,
- u256(7)
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage)
-{
- // stores and reads to/from two unknown locations, should not optimize away the first store
- AssemblyItems input{
- u256(7),
- Instruction::DUP2,
- Instruction::SSTORE, // store to "DUP1"
- Instruction::DUP2,
- Instruction::SLOAD, // read from "DUP2", might be equal to "DUP1"
- u256(0),
- Instruction::DUP3,
- Instruction::SSTORE // store different value to "DUP1"
- };
- checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage_same_value)
-{
- // stores and reads to/from two unknown locations, should not optimize away the first store
- // but it should optimize away the second, since we already know the value will be the same
- AssemblyItems input{
- u256(7),
- Instruction::DUP2,
- Instruction::SSTORE, // store to "DUP1"
- Instruction::DUP2,
- Instruction::SLOAD, // read from "DUP2", might be equal to "DUP1"
- u256(6),
- u256(1),
- Instruction::ADD,
- Instruction::DUP3,
- Instruction::SSTORE // store same value to "DUP1"
- };
- checkCSE(input, {
- u256(7),
- Instruction::DUP2,
- Instruction::SSTORE,
- Instruction::DUP2,
- Instruction::SLOAD
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage_at_known_location)
-{
- // stores and reads to/from two known locations, should optimize away the first store,
- // because we know that the location is different
- AssemblyItems input{
- u256(0x70),
- u256(1),
- Instruction::SSTORE, // store to 1
- u256(2),
- Instruction::SLOAD, // read from 2, is different from 1
- u256(0x90),
- u256(1),
- Instruction::SSTORE // store different value at 1
- };
- checkCSE(input, {
- u256(2),
- Instruction::SLOAD,
- u256(0x90),
- u256(1),
- Instruction::SSTORE
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage_at_known_location_offset)
-{
- // stores and reads to/from two locations which are known to be different,
- // should optimize away the first store, because we know that the location is different
- AssemblyItems input{
- u256(0x70),
- Instruction::DUP2,
- u256(1),
- Instruction::ADD,
- Instruction::SSTORE, // store to "DUP1"+1
- Instruction::DUP1,
- u256(2),
- Instruction::ADD,
- Instruction::SLOAD, // read from "DUP1"+2, is different from "DUP1"+1
- u256(0x90),
- Instruction::DUP3,
- u256(1),
- Instruction::ADD,
- Instruction::SSTORE // store different value at "DUP1"+1
- };
- checkCSE(input, {
- u256(2),
- Instruction::DUP2,
- Instruction::ADD,
- Instruction::SLOAD,
- u256(0x90),
- u256(1),
- Instruction::DUP4,
- Instruction::ADD,
- Instruction::SSTORE
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_deep_stack)
-{
- AssemblyItems input{
- Instruction::ADD,
- Instruction::SWAP1,
- Instruction::POP,
- Instruction::SWAP8,
- Instruction::POP,
- Instruction::SWAP8,
- Instruction::POP,
- Instruction::SWAP8,
- Instruction::SWAP5,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- };
- checkCSE(input, {
- Instruction::SWAP4,
- Instruction::SWAP12,
- Instruction::SWAP3,
- Instruction::SWAP11,
- Instruction::POP,
- Instruction::SWAP1,
- Instruction::SWAP3,
- Instruction::ADD,
- Instruction::SWAP8,
- Instruction::POP,
- Instruction::SWAP6,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- Instruction::POP,
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_jumpi_no_jump)
-{
- AssemblyItems input{
- u256(0),
- u256(1),
- Instruction::DUP2,
- AssemblyItem(PushTag, 1),
- Instruction::JUMPI
- };
- checkCSE(input, {
- u256(0),
- u256(1)
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_jumpi_jump)
-{
- AssemblyItems input{
- u256(1),
- u256(1),
- Instruction::DUP2,
- AssemblyItem(PushTag, 1),
- Instruction::JUMPI
- };
- checkCSE(input, {
- u256(1),
- Instruction::DUP1,
- AssemblyItem(PushTag, 1),
- Instruction::JUMP
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_empty_keccak256)
-{
- AssemblyItems input{
- u256(0),
- Instruction::DUP2,
- Instruction::KECCAK256
- };
- checkCSE(input, {
- u256(dev::keccak256(bytesConstRef()))
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_partial_keccak256)
-{
- AssemblyItems input{
- u256(0xabcd) << (256 - 16),
- u256(0),
- Instruction::MSTORE,
- u256(2),
- u256(0),
- Instruction::KECCAK256
- };
- checkCSE(input, {
- u256(0xabcd) << (256 - 16),
- u256(0),
- Instruction::MSTORE,
- u256(dev::keccak256(bytes{0xab, 0xcd}))
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_location)
-{
- // Keccak-256 twice from same dynamic location
- AssemblyItems input{
- Instruction::DUP2,
- Instruction::DUP1,
- Instruction::MSTORE,
- u256(64),
- Instruction::DUP2,
- Instruction::KECCAK256,
- u256(64),
- Instruction::DUP3,
- Instruction::KECCAK256
- };
- checkCSE(input, {
- Instruction::DUP2,
- Instruction::DUP1,
- Instruction::MSTORE,
- u256(64),
- Instruction::DUP2,
- Instruction::KECCAK256,
- Instruction::DUP1
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content)
-{
- // Keccak-256 twice from different dynamic location but with same content
- AssemblyItems input{
- Instruction::DUP1,
- u256(0x80),
- Instruction::MSTORE, // m[128] = DUP1
- u256(0x20),
- u256(0x80),
- Instruction::KECCAK256, // keccak256(m[128..(128+32)])
- Instruction::DUP2,
- u256(12),
- Instruction::MSTORE, // m[12] = DUP1
- u256(0x20),
- u256(12),
- Instruction::KECCAK256 // keccak256(m[12..(12+32)])
- };
- checkCSE(input, {
- u256(0x80),
- Instruction::DUP2,
- Instruction::DUP2,
- Instruction::MSTORE,
- u256(0x20),
- Instruction::SWAP1,
- Instruction::KECCAK256,
- u256(12),
- Instruction::DUP3,
- Instruction::SWAP1,
- Instruction::MSTORE,
- Instruction::DUP1
- });
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content_dynamic_store_in_between)
-{
- // Keccak-256 twice from different dynamic location but with same content,
- // dynamic mstore in between, which forces us to re-calculate the hash
- AssemblyItems input{
- u256(0x80),
- Instruction::DUP2,
- Instruction::DUP2,
- Instruction::MSTORE, // m[128] = DUP1
- u256(0x20),
- Instruction::DUP1,
- Instruction::DUP3,
- Instruction::KECCAK256, // keccak256(m[128..(128+32)])
- u256(12),
- Instruction::DUP5,
- Instruction::DUP2,
- Instruction::MSTORE, // m[12] = DUP1
- Instruction::DUP12,
- Instruction::DUP14,
- Instruction::MSTORE, // destroys memory knowledge
- Instruction::SWAP2,
- Instruction::SWAP1,
- Instruction::SWAP2,
- Instruction::KECCAK256 // keccak256(m[12..(12+32)])
- };
- checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content_noninterfering_store_in_between)
-{
- // Keccak-256 twice from different dynamic location but with same content,
- // dynamic mstore in between, but does not force us to re-calculate the hash
- AssemblyItems input{
- u256(0x80),
- Instruction::DUP2,
- Instruction::DUP2,
- Instruction::MSTORE, // m[128] = DUP1
- u256(0x20),
- Instruction::DUP1,
- Instruction::DUP3,
- Instruction::KECCAK256, // keccak256(m[128..(128+32)])
- u256(12),
- Instruction::DUP5,
- Instruction::DUP2,
- Instruction::MSTORE, // m[12] = DUP1
- Instruction::DUP12,
- u256(12 + 32),
- Instruction::MSTORE, // does not destoy memory knowledge
- Instruction::DUP13,
- u256(128 - 32),
- Instruction::MSTORE, // does not destoy memory knowledge
- u256(0x20),
- u256(12),
- Instruction::KECCAK256 // keccak256(m[12..(12+32)])
- };
- // if this changes too often, only count the number of SHA3 and MSTORE instructions
- AssemblyItems output = CSE(input);
- BOOST_CHECK_EQUAL(4, count(output.begin(), output.end(), AssemblyItem(Instruction::MSTORE)));
- BOOST_CHECK_EQUAL(1, count(output.begin(), output.end(), AssemblyItem(Instruction::KECCAK256)));
-}
-
-BOOST_AUTO_TEST_CASE(cse_with_initially_known_stack)
-{
- eth::KnownState state = createInitialState(AssemblyItems{
- u256(0x12),
- u256(0x20),
- Instruction::ADD
- });
- AssemblyItems input{
- u256(0x12 + 0x20)
- };
- checkCSE(input, AssemblyItems{Instruction::DUP1}, state);
-}
-
-BOOST_AUTO_TEST_CASE(cse_equality_on_initially_known_stack)
-{
- eth::KnownState state = createInitialState(AssemblyItems{Instruction::DUP1});
- AssemblyItems input{
- Instruction::EQ
- };
- AssemblyItems output = CSE(input, state);
- // check that it directly pushes 1 (true)
- BOOST_CHECK(find(output.begin(), output.end(), AssemblyItem(u256(1))) != output.end());
-}
-
-BOOST_AUTO_TEST_CASE(cse_access_previous_sequence)
-{
- // Tests that the code generator detects whether it tries to access SLOAD instructions
- // from a sequenced expression which is not in its scope.
- eth::KnownState state = createInitialState(AssemblyItems{
- u256(0),
- Instruction::SLOAD,
- u256(1),
- Instruction::ADD,
- u256(0),
- Instruction::SSTORE
- });
- // now stored: val_1 + 1 (value at sequence 1)
- // if in the following instructions, the SLOAD cresolves to "val_1 + 1",
- // this cannot be generated because we cannot load from sequence 1 anymore.
- AssemblyItems input{
- u256(0),
- Instruction::SLOAD,
- };
- BOOST_CHECK_THROW(CSE(input, state), StackTooDeepException);
- // @todo for now, this throws an exception, but it should recover to the following
- // (or an even better version) at some point:
- // 0, SLOAD, 1, ADD, SSTORE, 0 SLOAD
-}
-
-BOOST_AUTO_TEST_CASE(cse_optimise_return)
-{
- checkCSE(
- AssemblyItems{u256(0), u256(7), Instruction::RETURN},
- AssemblyItems{Instruction::STOP}
- );
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_remove_unused)
-{
- // remove parts of the code that are unused
- AssemblyItems input{
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- u256(7),
- AssemblyItem(Tag, 1),
- };
- checkCFG(input, {});
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_remove_unused_loop)
-{
- AssemblyItems input{
- AssemblyItem(PushTag, 3),
- Instruction::JUMP,
- AssemblyItem(Tag, 1),
- u256(7),
- AssemblyItem(PushTag, 2),
- Instruction::JUMP,
- AssemblyItem(Tag, 2),
- u256(8),
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- AssemblyItem(Tag, 3),
- u256(11)
- };
- checkCFG(input, {u256(11)});
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_reconnect_single_jump_source)
-{
- // move code that has only one unconditional jump source
- AssemblyItems input{
- u256(1),
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- AssemblyItem(Tag, 2),
- u256(2),
- AssemblyItem(PushTag, 3),
- Instruction::JUMP,
- AssemblyItem(Tag, 1),
- u256(3),
- AssemblyItem(PushTag, 2),
- Instruction::JUMP,
- AssemblyItem(Tag, 3),
- u256(4),
- };
- checkCFG(input, {u256(1), u256(3), u256(2), u256(4)});
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_do_not_remove_returned_to)
-{
- // do not remove parts that are "returned to"
- AssemblyItems input{
- AssemblyItem(PushTag, 1),
- AssemblyItem(PushTag, 2),
- Instruction::JUMP,
- AssemblyItem(Tag, 2),
- Instruction::JUMP,
- AssemblyItem(Tag, 1),
- u256(2)
- };
- checkCFG(input, {u256(2)});
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator)
-{
- AssemblyItems input{
- AssemblyItem(PushTag, 2),
- AssemblyItem(PushTag, 1),
- AssemblyItem(PushTag, 3),
- u256(6),
- Instruction::SWAP3,
- Instruction::JUMP,
- AssemblyItem(Tag, 1),
- u256(6),
- Instruction::SWAP3,
- Instruction::JUMP,
- AssemblyItem(Tag, 2),
- u256(6),
- Instruction::SWAP3,
- Instruction::JUMP,
- AssemblyItem(Tag, 3)
- };
- BlockDeduplicator dedup(input);
- dedup.deduplicate();
-
- set<u256> pushTags;
- for (AssemblyItem const& item: input)
- if (item.type() == PushTag)
- pushTags.insert(item.data());
- BOOST_CHECK_EQUAL(pushTags.size(), 2);
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator_loops)
-{
- AssemblyItems input{
- u256(0),
- Instruction::SLOAD,
- AssemblyItem(PushTag, 1),
- AssemblyItem(PushTag, 2),
- Instruction::JUMPI,
- Instruction::JUMP,
- AssemblyItem(Tag, 1),
- u256(5),
- u256(6),
- Instruction::SSTORE,
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- AssemblyItem(Tag, 2),
- u256(5),
- u256(6),
- Instruction::SSTORE,
- AssemblyItem(PushTag, 2),
- Instruction::JUMP,
- };
- BlockDeduplicator dedup(input);
- dedup.deduplicate();
-
- set<u256> pushTags;
- for (AssemblyItem const& item: input)
- if (item.type() == PushTag)
- pushTags.insert(item.data());
- BOOST_CHECK_EQUAL(pushTags.size(), 1);
-}
-
-BOOST_AUTO_TEST_CASE(clear_unreachable_code)
-{
- AssemblyItems items{
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- u256(0),
- Instruction::SLOAD,
- AssemblyItem(Tag, 2),
- u256(5),
- u256(6),
- Instruction::SSTORE,
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- u256(5),
- u256(6)
- };
- AssemblyItems expectation{
- AssemblyItem(PushTag, 1),
- Instruction::JUMP,
- AssemblyItem(Tag, 2),
- u256(5),
- u256(6),
- Instruction::SSTORE,
- AssemblyItem(PushTag, 1),
- Instruction::JUMP
- };
- PeepholeOptimiser peepOpt(items);
- BOOST_REQUIRE(peepOpt.optimise());
- BOOST_CHECK_EQUAL_COLLECTIONS(
- items.begin(), items.end(),
- expectation.begin(), expectation.end()
- );
-}
-
-BOOST_AUTO_TEST_CASE(peephole_double_push)
-{
- AssemblyItems items{
- u256(0),
- u256(0),
- u256(5),
- u256(5),
- u256(4),
- u256(5)
- };
- AssemblyItems expectation{
- u256(0),
- Instruction::DUP1,
- u256(5),
- Instruction::DUP1,
- u256(4),
- u256(5)
- };
- PeepholeOptimiser peepOpt(items);
- BOOST_REQUIRE(peepOpt.optimise());
- BOOST_CHECK_EQUAL_COLLECTIONS(
- items.begin(), items.end(),
- expectation.begin(), expectation.end()
- );
-}
-
BOOST_AUTO_TEST_CASE(computing_constants)
{
char const* sourceCode = R"(
@@ -1377,29 +581,6 @@ BOOST_AUTO_TEST_CASE(invalid_state_at_control_flow_join)
compareVersions("test()");
}
-BOOST_AUTO_TEST_CASE(cse_sub_zero)
-{
- checkCSE({
- u256(0),
- Instruction::DUP2,
- Instruction::SUB
- }, {
- Instruction::DUP1
- });
-
- checkCSE({
- Instruction::DUP1,
- u256(0),
- Instruction::SUB
- }, {
- u256(0),
- Instruction::DUP2,
- Instruction::SWAP1,
- Instruction::SUB
- });
-}
-
-
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index 78edd4d1..2be824d6 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -898,7 +898,12 @@ BOOST_AUTO_TEST_CASE(multiple_visibility_specifiers)
contract c {
uint private internal a;
})";
- CHECK_PARSE_ERROR(text, "Visibility already specified");
+ CHECK_PARSE_ERROR(text, "Visibility already specified as \"private\".");
+ text = R"(
+ contract c {
+ function f() private external {}
+ })";
+ CHECK_PARSE_ERROR(text, "Visibility already specified as \"private\".");
}
BOOST_AUTO_TEST_CASE(multiple_payable_specifiers)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 02:12:33 +0800