Merge pull request #3678 from ethereum/develop

Merge develop into release.

1 files changed, 49 insertions, 1 deletions

diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp
index 03287b28..bc81b3b1 100644
--- a/test/libsolidity/Imports.cpp
+++ b/test/libsolidity/Imports.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <test/libsolidity/ErrorCheck.h>
+#include <test/TestHelper.h>
 
 #include <libsolidity/interface/Exceptions.h>
 #include <libsolidity/interface/CompilerStack.h>
@@ -44,6 +45,7 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 {
 	CompilerStack c;
 	c.addSource("a", "contract C {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -52,6 +54,7 @@ BOOST_AUTO_TEST_CASE(regular_import)
 	CompilerStack c;
 	c.addSource("a", "contract C {} pragma solidity >=0.0;");
 	c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -60,6 +63,7 @@ BOOST_AUTO_TEST_CASE(import_does_not_clutter_importee)
 	CompilerStack c;
 	c.addSource("a", "contract C { D d; } pragma solidity >=0.0;");
 	c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 }
 
@@ -69,6 +73,7 @@ BOOST_AUTO_TEST_CASE(import_is_transitive)
 	c.addSource("a", "contract C { } pragma solidity >=0.0;");
 	c.addSource("b", "import \"a\"; pragma solidity >=0.0;");
 	c.addSource("c", "import \"b\"; contract D is C {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -77,6 +82,7 @@ BOOST_AUTO_TEST_CASE(circular_import)
 	CompilerStack c;
 	c.addSource("a", "import \"b\"; contract C { D d; } pragma solidity >=0.0;");
 	c.addSource("b", "import \"a\"; contract D { C c; } pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -86,6 +92,7 @@ BOOST_AUTO_TEST_CASE(relative_import)
 	c.addSource("a", "import \"./dir/b\"; contract A is B {} pragma solidity >=0.0;");
 	c.addSource("dir/b", "contract B {} pragma solidity >=0.0;");
 	c.addSource("dir/c", "import \"../a\"; contract C is A {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -94,6 +101,7 @@ BOOST_AUTO_TEST_CASE(relative_import_multiplex)
 	CompilerStack c;
 	c.addSource("a", "contract A {} pragma solidity >=0.0;");
 	c.addSource("dir/a/b/c", "import \"../../.././a\"; contract B is A {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -102,6 +110,7 @@ BOOST_AUTO_TEST_CASE(simple_alias)
 	CompilerStack c;
 	c.addSource("a", "contract A {} pragma solidity >=0.0;");
 	c.addSource("dir/a/b/c", "import \"../../.././a\" as x; contract B is x.A { function() { x.A r = x.A(20); } } pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -111,6 +120,7 @@ BOOST_AUTO_TEST_CASE(library_name_clash)
 	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\";");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 }
 
@@ -119,6 +129,7 @@ BOOST_AUTO_TEST_CASE(library_name_clash_with_contract)
 	CompilerStack c;
 	c.addSource("a", "contract A {} pragma solidity >=0.0;");
 	c.addSource("b", "library A {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -128,6 +139,7 @@ BOOST_AUTO_TEST_CASE(complex_import)
 	c.addSource("a", "contract A {} contract B {} contract C { struct S { uint a; } } pragma solidity >=0.0;");
 	c.addSource("b", "import \"a\" as x; import {B as b, C as c, C} from \"a\"; "
 				"contract D is b { function f(c.S var1, x.C.S var2, C.S var3) internal {} } pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -136,14 +148,19 @@ BOOST_AUTO_TEST_CASE(name_clash_in_import)
 	CompilerStack c;
 	c.addSource("a", "contract A {} pragma solidity >=0.0;");
 	c.addSource("b", "import \"a\"; contract A {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 	c.addSource("b", "import \"a\" as A; contract A {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 	c.addSource("b", "import {A as b} from \"a\"; contract b {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 	c.addSource("b", "import {A} from \"a\"; contract A {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 	c.addSource("b", "import {A} from \"a\"; contract B {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -155,6 +172,7 @@ BOOST_AUTO_TEST_CASE(remappings)
 	c.addSource("b", "import \"t/tee.sol\"; contract A is Tee {} pragma solidity >=0.0;");
 	c.addSource("s_1.4.6/s.sol", "contract S {} pragma solidity >=0.0;");
 	c.addSource("Tee/tee.sol", "contract Tee {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -166,6 +184,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings)
 	c.addSource("b/b.sol", "import \"s/s.sol\"; contract B is SSeven {} pragma solidity >=0.0;");
 	c.addSource("s_1.4.6/s.sol", "contract SSix {} pragma solidity >=0.0;");
 	c.addSource("s_1.4.7/s.sol", "contract SSeven {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -174,6 +193,7 @@ BOOST_AUTO_TEST_CASE(filename_with_period)
 	CompilerStack c;
 	c.addSource("a/a.sol", "import \".b.sol\"; contract A is B {} pragma solidity >=0.0;");
 	c.addSource("a/.b.sol", "contract B {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 }
 
@@ -185,6 +205,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_ensure_default_and_module_pres
 	c.addSource("vendor/bar/bar.sol", "import \"foo/foo.sol\"; contract Bar {Foo1 foo;} pragma solidity >=0.0;");
 	c.addSource("vendor/foo_1.0.0/foo.sol", "contract Foo1 {} pragma solidity >=0.0;");
 	c.addSource("vendor/foo_2.0.0/foo.sol", "contract Foo2 {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 }
 
@@ -196,6 +217,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent)
 	c.addSource("a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;");
 	c.addSource("d/z.sol", "contract D {} pragma solidity >=0.0;");
 	c.addSource("e/y/z/z.sol", "contract E {} pragma solidity >=0.0;");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 	CompilerStack d;
 	d.setRemappings(vector<string>{"a/b:x=e", "a:x/y/z=d"});
@@ -203,6 +225,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent)
 	d.addSource("a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;");
 	d.addSource("d/z.sol", "contract D {} pragma solidity >=0.0;");
 	d.addSource("e/y/z/z.sol", "contract E {} pragma solidity >=0.0;");
+	d.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(d.compile());
 }
 
@@ -212,6 +235,7 @@ BOOST_AUTO_TEST_CASE(shadowing_via_import)
 	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\";");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(!c.compile());
 }
 
@@ -225,6 +249,7 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_with_imports)
 		contract C {
 		}
 	)");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 	size_t errorCount = 0;
 	for (auto const& e: c.errors())
@@ -251,6 +276,7 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_with_multiple_imports)
 		contract C {
 		}
 	)");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	BOOST_CHECK(c.compile());
 	auto numErrors = c.errors().size();
 	// Sometimes we get the prerelease warning, sometimes not.
@@ -266,7 +292,29 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_with_multiple_imports)
 	}
 }
 
-
+BOOST_AUTO_TEST_CASE(shadowing_builtins_with_alias)
+{
+	CompilerStack c;
+	c.addSource("B.sol", "contract C {} pragma solidity >=0.0;");
+	c.addSource("b", R"(
+		pragma solidity >=0.0;
+		import {C as msg} from "B.sol";
+	)");
+	c.setEVMVersion(dev::test::Options::get().evmVersion());
+	BOOST_CHECK(c.compile());
+	auto numErrors = c.errors().size();
+	// Sometimes we get the prerelease warning, sometimes not.
+	BOOST_CHECK(1 <= numErrors && numErrors <= 2);
+	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()