Merge branch 'develop' into externalFunctionsInLibraries

Changelog.md

@@ -3,8 +3,11 @@
 Features:
 
 Bugfixes:
+ * Code Generator: Allow ``block.blockhash`` without being called.
  * Code Generator: Properly skip unneeded storgae array cleanup when not reducing length.
+ * Code Generator: Bugfix in modifier lookup in libraries.
  * Commandline interface: Support ``--evm-version constantinople`` properly.
+ * DocString Parser: Fix error message for empty descriptions.
  * Standard JSON: Support ``constantinople`` as ``evmVersion`` properly.
  * Type System: Make external library functions accessible.
 

libsolidity/codegen/CompilerContext.cpp

@@ -193,14 +193,22 @@ Declaration const* CompilerContext::nextFunctionToCompile() const
 	return m_functionCompilationQueue.nextFunctionToCompile();
 }
 
-ModifierDefinition const& CompilerContext::functionModifier(string const& _name) const
+ModifierDefinition const& CompilerContext::resolveVirtualFunctionModifier(
+	ModifierDefinition const& _modifier
+) const
 {
+	// Libraries do not allow inheritance and their functions can be inlined, so we should not
+	// search the inheritance hierarchy (which will be the wrong one in case the function
+	// is inlined).
+	if (auto scope = dynamic_cast<ContractDefinition const*>(_modifier.scope()))
+		if (scope->isLibrary())
+			return _modifier;
 	solAssert(!m_inheritanceHierarchy.empty(), "No inheritance hierarchy set.");
 	for (ContractDefinition const* contract: m_inheritanceHierarchy)
 		for (ModifierDefinition const* modifier: contract->functionModifiers())
-			if (modifier->name() == _name)
+			if (modifier->name() == _modifier.name())
 				return *modifier;
-	solAssert(false, "Function modifier " + _name + " not found.");
+	solAssert(false, "Function modifier " + _modifier.name() + " not found in inheritance hierarchy.");
 }
 
 unsigned CompilerContext::baseStackOffsetOfVariable(Declaration const& _declaration) const

libsolidity/codegen/CompilerContext.h

@@ -130,7 +130,7 @@ public:
 	void appendMissingLowLevelFunctions();
 	ABIFunctions& abiFunctions() { return m_abiFunctions; }
 
-	ModifierDefinition const& functionModifier(std::string const& _name) const;
+	ModifierDefinition const& resolveVirtualFunctionModifier(ModifierDefinition const& _modifier) const;
 	/// Returns the distance of the given local variable from the bottom of the stack (of the current function).
 	unsigned baseStackOffsetOfVariable(Declaration const& _declaration) const;
 	/// If supplied by a value returned by @ref baseStackOffsetOfVariable(variable), returns

libsolidity/codegen/ContractCompiler.cpp

@@ -1002,7 +1002,10 @@ void ContractCompiler::appendModifierOrFunctionCode()
 			appendModifierOrFunctionCode();
 		else
 		{
-			ModifierDefinition const& modifier = m_context.functionModifier(modifierInvocation->name()->name());
+			ModifierDefinition const& nonVirtualModifier = dynamic_cast<ModifierDefinition const&>(
+				*modifierInvocation->name()->annotation().referencedDeclaration
+			);
+			ModifierDefinition const& modifier = m_context.resolveVirtualFunctionModifier(nonVirtualModifier);
 			CompilerContext::LocationSetter locationSetter(m_context, modifier);
 			solAssert(modifier.parameters().size() == modifierInvocation->arguments().size(), "");
 			for (unsigned i = 0; i < modifier.parameters().size(); ++i)

libsolidity/codegen/ExpressionCompiler.cpp

@@ -1147,6 +1147,9 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 		else if (member == "sig")
 			m_context << u256(0) << Instruction::CALLDATALOAD
 				<< (u256(0xffffffff) << (256 - 32)) << Instruction::AND;
+		else if (member == "blockhash")
+		{
+		}
 		else
 			solAssert(false, "Unknown magic member.");
 		break;

libsolidity/parsing/DocStringParser.cpp

@@ -119,21 +119,17 @@ DocStringParser::iter DocStringParser::parseDocTagParam(iter _pos, iter _end)
 		return _end;
 	}
 	auto nameEndPos = firstSpaceOrTab(nameStartPos, _end);
-	if (nameEndPos == _end)
-	{
-		appendError("End of param name not found: " + string(nameStartPos, _end));
-		return _end;
-	}
 	auto paramName = string(nameStartPos, nameEndPos);
 
 	auto descStartPos = skipWhitespace(nameEndPos, _end);
-	if (descStartPos == _end)
+	auto nlPos = find(descStartPos, _end, '\n');
+
+	if (descStartPos == nlPos)
 	{
 		appendError("No description given for param " + paramName);
 		return _end;
 	}
 
-	auto nlPos = find(descStartPos, _end, '\n');
 	auto paramDesc = string(descStartPos, nlPos);
 	newTag("param");
 	m_lastTag->paramName = paramName;

scripts/soltest.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+set -e
+
+REPO_ROOT="$(dirname "$0")"/..
+USE_DEBUGGER=0
+DEBUGGER="gdb --args"
+BOOST_OPTIONS=
+SOLTEST_OPTIONS=
+
+while [ $# -gt 0 ]
+do
+	case "$1" in
+		--debugger)
+			shift
+			DEBUGGER="$1"
+			USE_DEBUGGER=1
+			;;
+		--debug)
+			USE_DEBUGGER=1
+			;;
+		--boost-options)
+			shift
+			BOOST_OPTIONS="${BOOST_OPTIONS} $1"
+			;;
+		-t)
+			shift
+			BOOST_OPTIONS="${BOOST_OPTIONS} -t $1"
+			;;
+		--show-progress | -p)
+			BOOST_OPTIONS="${BOOST_OPTIONS} $1"
+			;;
+		*)
+			SOLTEST_OPTIONS="${SOLTEST_OPTIONS} $1"
+			;;
+	esac
+	shift
+done
+if [ "$USE_DEBUGGER" -ne "0" ]; then
+	DEBUG_PREFIX=${DEBUGGER}
+fi
+
+exec ${DEBUG_PREFIX} ${REPO_ROOT}/build/test/soltest ${BOOST_OPTIONS} -- --testpath ${REPO_ROOT}/test ${SOLTEST_OPTIONS}

test/ExecutionFramework.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 #include <test/RPCSession.h>
 
 #include <libsolidity/interface/EVMVersion.h>

test/Options.cpp

@@ -19,9 +19,10 @@
 * @date 2014
 */
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/EVMVersion.h>
+#include <libsolidity/interface/Exceptions.h>
 
 #include <boost/test/framework.hpp>
 
@@ -71,6 +72,19 @@ Options::Options()
 			testPath = path;
 }
 
+void Options::validate() const
+{
+	solAssert(
+		!dev::test::Options::get().testPath.empty(),
+		"No test path specified. The --testpath argument is required."
+	);
+	if (!disableIPC)
+		solAssert(
+			!dev::test::Options::get().ipcPath.empty(),
+			"No ipc path specified. The --ipcpath argument is required, unless --no-ipc is used."
+		);
+}
+
 dev::solidity::EVMVersion Options::evmVersion() const
 {
 	if (!evmVersionString.empty())

test/Options.h

@@ -41,6 +41,7 @@ struct Options: boost::noncopyable
 	bool disableIPC = false;
 	bool disableSMT = false;
 
+	void validate() const;
 	solidity::EVMVersion evmVersion() const;
 
 	static Options const& get();

test/RPCSession.cpp

@@ -21,7 +21,7 @@
 
 #include <test/RPCSession.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/EVMVersion.h>
 

test/boostTest.cpp

@@ -35,7 +35,7 @@
 
 #pragma GCC diagnostic pop
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 #include <test/libsolidity/SyntaxTest.h>
 
 using namespace boost::unit_test;
@@ -55,6 +55,7 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 {
 	master_test_suite_t& master = framework::master_test_suite();
 	master.p_name.value = "SolidityTests";
+	dev::test::Options::get().validate();
 	solAssert(dev::solidity::test::SyntaxTest::registerTests(
 		master,
 		dev::test::Options::get().testPath / "libsolidity",

test/libdevcore/Checksum.cpp

@@ -22,7 +22,7 @@
 #include <libdevcore/Exceptions.h>
 
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libdevcore/IndentedWriter.cpp

@@ -20,7 +20,7 @@
 
 #include <libdevcore/IndentedWriter.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libdevcore/JSON.cpp

@@ -21,7 +21,7 @@
 
 #include <libdevcore/JSON.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libdevcore/StringUtils.cpp

@@ -20,7 +20,7 @@
 
 #include <libdevcore/StringUtils.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libdevcore/SwarmHash.cpp

@@ -20,7 +20,7 @@
 
 #include <libdevcore/SwarmHash.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libdevcore/UTF8.cpp

@@ -21,7 +21,7 @@
 #include <libdevcore/CommonData.h>
 #include <libdevcore/UTF8.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libdevcore/Whiskers.cpp

@@ -20,7 +20,7 @@
 
 #include <libdevcore/Whiskers.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libevmasm/Optimiser.cpp

@@ -20,7 +20,7 @@
  * Tests for the Solidity optimizer.
  */
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/PeepholeOptimiser.h>

test/libevmasm/SourceLocation.cpp

@@ -22,7 +22,7 @@
 
 #include <libevmasm/SourceLocation.h>
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 namespace dev
 {

test/libjulia/Common.cpp

@@ -21,7 +21,7 @@
 
 #include <test/libjulia/Common.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libjulia/optimiser/Disambiguator.h>
 

test/libjulia/Parser.cpp

@@ -19,7 +19,7 @@
  * Unit tests for parsing Julia.
  */
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 #include <test/libsolidity/ErrorCheck.h>
 

test/liblll/Compiler.cpp

@@ -20,7 +20,7 @@
  * Unit tests for the LLL compiler.
  */
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libdevcore/FixedHash.h>
 

test/liblll/EndToEndTest.cpp

@@ -21,7 +21,7 @@
  */
 
 #include <test/liblll/ExecutionFramework.h>
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libsolidity/ASTJSON.cpp

@@ -20,7 +20,7 @@
  * Tests for the json ast output.
  */
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/Exceptions.h>
 #include <libsolidity/interface/CompilerStack.h>

test/libsolidity/AnalysisFramework.cpp

@@ -20,7 +20,7 @@
 
 #include <test/libsolidity/AnalysisFramework.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>

test/libsolidity/Assembly.cpp

@@ -20,7 +20,7 @@
  * Unit tests for Assembly Items from evmasm/Assembly.h
  */
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libevmasm/SourceLocation.h>
 #include <libevmasm/Assembly.h>

test/libsolidity/Imports.cpp

@@ -21,7 +21,7 @@
  */
 
 #include <test/libsolidity/ErrorCheck.h>
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/Exceptions.h>
 #include <libsolidity/interface/CompilerStack.h>

test/libsolidity/InlineAssembly.cpp

@@ -20,7 +20,7 @@
  * Unit tests for inline assembly.
  */
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 #include <libsolidity/interface/AssemblyStack.h>
 #include <libsolidity/parsing/Scanner.h>

test/libsolidity/JSONCompiler.cpp

@@ -25,8 +25,8 @@
 #include <libsolidity/interface/Version.h>
 #include <libsolc/libsolc.h>
 
-#include "../Metadata.h"
+#include <test/Metadata.h>
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libsolidity/Metadata.cpp

@@ -19,8 +19,8 @@
  * Unit tests for the metadata output.
  */
 
-#include "../Metadata.h"
+#include <test/Metadata.h>
-#include "../TestHelper.h"
+#include <test/Options.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <libdevcore/SwarmHash.h>
 #include <libdevcore/JSON.h>

test/libsolidity/SemVerMatcher.cpp

@@ -25,7 +25,7 @@
 #include <tuple>
 #include <libsolidity/parsing/Scanner.h>
 #include <libsolidity/analysis/SemVerHandler.h>
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libsolidity/SolidityABIJSON.cpp

@@ -20,7 +20,7 @@
  * Unit tests for the solidity compiler JSON Interface output.
  */
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 #include <libsolidity/interface/CompilerStack.h>
 
 #include <libdevcore/Exceptions.h>

test/libsolidity/SolidityEndToEndTest.cpp

@@ -23,7 +23,7 @@
 
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/Exceptions.h>
 #include <libsolidity/interface/EVMVersion.h>
@@ -1788,6 +1788,23 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
 	ABI_CHECK(callContractFunction("b(address,uint256)", oogRecipient, 10), encodeArgs());
 }
 
+BOOST_AUTO_TEST_CASE(uncalled_blockhash)
+{
+	char const* code = R"(
+		contract C {
+			function f() public view returns (bytes32)
+			{
+				var x = block.blockhash;
+				return x(block.number - 1);
+			}
+		}
+	)";
+	compileAndRun(code, 0, "C");
+	bytes result = callContractFunction("f()");
+	BOOST_REQUIRE_EQUAL(result.size(), 32);
+	BOOST_CHECK(result[0] != 0 || result[1] != 0 || result[2] != 0);
+}
+
 BOOST_AUTO_TEST_CASE(log0)
 {
 	char const* sourceCode = R"(
@@ -2879,6 +2896,58 @@ BOOST_AUTO_TEST_CASE(function_modifier_multiple_times_local_vars)
 	ABI_CHECK(callContractFunction("a()"), encodeArgs(0));
 }
 
+BOOST_AUTO_TEST_CASE(function_modifier_library)
+{
+	char const* sourceCode = R"(
+		library L {
+			struct S { uint v; }
+			modifier mod(S storage s) { s.v++; _; }
+			function libFun(S storage s) mod(s) internal { s.v += 0x100; }
+		}
+
+		contract Test {
+			using L for *;
+			L.S s;
+
+			function f() public returns (uint) {
+				s.libFun();
+				L.libFun(s);
+				return s.v;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	ABI_CHECK(callContractFunction("f()"), encodeArgs(0x202));
+}
+
+BOOST_AUTO_TEST_CASE(function_modifier_library_inheritance)
+{
+	// Tests that virtual lookup for modifiers in libraries does not consider
+	// the current inheritance hierarchy.
+
+	char const* sourceCode = R"(
+		library L {
+			struct S { uint v; }
+			modifier mod(S storage s) { s.v++; _; }
+			function libFun(S storage s) mod(s) internal { s.v += 0x100; }
+		}
+
+		contract Test {
+			using L for *;
+			L.S s;
+			modifier mod(L.S storage) { revert(); _; }
+
+			function f() public returns (uint) {
+				s.libFun();
+				L.libFun(s);
+				return s.v;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	ABI_CHECK(callContractFunction("f()"), encodeArgs(0x202));
+}
+
 BOOST_AUTO_TEST_CASE(crazy_elementary_typenames_on_stack)
 {
 	char const* sourceCode = R"(

test/libsolidity/SolidityExpressionCompiler.cpp

@@ -30,7 +30,7 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/TypeChecker.h>
 #include <libsolidity/interface/ErrorReporter.h>
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 using namespace std;
 

test/libsolidity/SolidityNameAndTypeResolution.cpp

@@ -22,7 +22,7 @@
 
 #include <test/libsolidity/AnalysisFramework.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/ast/AST.h>
 

test/libsolidity/SolidityNatspecJSON.cpp

@@ -20,7 +20,7 @@
  * Unit tests for the solidity compiler JSON Interface output.
  */
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 #include <string>
 #include <libdevcore/JSON.h>
 #include <libsolidity/interface/CompilerStack.h>

test/libsolidity/SolidityParser.cpp

@@ -25,8 +25,8 @@
 #include <libsolidity/parsing/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/interface/ErrorReporter.h>
-#include "../TestHelper.h"
+#include <test/Options.h>
-#include "ErrorCheck.h"
+#include <test/libsolidity/ErrorCheck.h>
 
 using namespace std;
 

test/libsolidity/SyntaxTest.cpp

@@ -21,6 +21,7 @@
 #include <boost/throw_exception.hpp>
 #include <cctype>
 #include <fstream>
+#include <memory>
 #include <stdexcept>
 
 using namespace dev;
@@ -188,6 +189,9 @@ int SyntaxTest::registerTests(
 	}
 	else
 	{
+		static vector<unique_ptr<string>> filenames;
+
+		filenames.emplace_back(new string(_path.string()));
 		_suite.add(make_test_case(
 			[fullpath]
 			{
@@ -196,7 +200,7 @@ int SyntaxTest::registerTests(
 					BOOST_ERROR("Test expectation mismatch.\n" + errorStream.str());
 			},
 			_path.stem().string(),
-			_path.string(),
+			*filenames.back(),
 			0
 		));
 		numTestsAdded = 1;

test/libsolidity/ViewPureChecker.cpp

@@ -20,7 +20,7 @@
 
 #include <test/libsolidity/AnalysisFramework.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libsolidity/syntaxTests/docstring_empty_description.sol

@@ -0,0 +1,6 @@
+contract C {
+    /// @param id
+    function vote(uint id) public;
+}
+// ----
+// DocstringParsingError: No description given for param id

test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol

@@ -0,0 +1,14 @@
+library WithModifier {
+    modifier mod() { require(msg.value > 10 ether); _; }
+    function withMod(uint self) mod() internal view { require(self > 0); }
+}
+
+contract Test {
+    using WithModifier for *;
+
+    function f(uint _value) public payable {
+        _value.withMod();
+        WithModifier.withMod(_value);
+    }
+}
+// ----