Merge pull request #9106 from ethereum/develop

Merge develop into breaking.

test/libsolidity/syntaxTests/inheritance/override/no_matching_resolution.sol

@@ -0,0 +1,11 @@
+contract A {
+    function f() virtual internal {}
+}
+contract B is A {
+    function f() virtual override internal {}
+    function h() pure internal { f; }
+}
+contract C is B {
+    function f() override internal {}
+    function i() pure internal { f; }
+}

test/libsolidity/syntaxTests/inlineAssembly/const_forward_reference.sol

@@ -0,0 +1,8 @@
+contract C {
+  function f() public pure {
+    assembly {
+      pop(add(add(1, 2), c))
+    }
+  }
+  int constant c = 1;
+}

test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol

@@ -0,0 +1,12 @@
+contract C {
+  function f() {
+    assembly {
+      c := add(add(1, 2), c)
+    }
+  }
+  int constant c = 0 + 1;
+}
+// ----
+// SyntaxError: (15-83): No visibility specified. Did you intend to add "public"?
+// TypeError: (71-72): Constant variables with non-literal values cannot be forward referenced from inline assembly.
+// TypeError: (51-52): Constant variables cannot be assigned to.

test/libsolidity/syntaxTests/inlineAssembly/istanbul_on_petersburg.sol

@@ -13,7 +13,7 @@ contract C {
 // ====
 // EVMVersion: =petersburg
 // ----
-// TypeError: (101-108): The "chainid" instruction is only available for Istanbul-compatible VMs  (you are currently compiling for "petersburg").
+// TypeError: (101-108): The "chainid" instruction is only available for Istanbul-compatible VMs (you are currently compiling for "petersburg").
 // DeclarationError: (95-110): Variable count does not match number of values (1 vs. 0)
-// TypeError: (215-226): The "selfbalance" instruction is only available for Istanbul-compatible VMs  (you are currently compiling for "petersburg").
+// TypeError: (215-226): The "selfbalance" instruction is only available for Istanbul-compatible VMs (you are currently compiling for "petersburg").
 // DeclarationError: (209-228): Variable count does not match number of values (1 vs. 0)