Fixing tests on breaking branch.

docs/types/value-types.rst

@@ -656,13 +656,8 @@ External (or public) functions have the following members:
 
 Example that shows how to use the members::
 
-<<<<<<< HEAD
-    pragma solidity >=0.6.4 <0.8.0;
-=======
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.6.0 <0.7.0;
-    // This will report a warning
->>>>>>> origin/develop
+    pragma solidity >=0.6.4 <0.8.0;
 
     contract Example {
         function f() public payable returns (bytes4) {

docs/units-and-global-variables.rst

@@ -330,6 +330,7 @@ for an interface type ``I``:
     A ``bytes4`` value containing the `EIP-165 <https://eips.ethereum.org/EIPS/eip-165>`_
     interface identifier of the given interface ``I``. This identifier is defined as the ``XOR`` of all
     function selectors defined within the interface itself - excluding all inherited functions.
+
 The following properties are available for an integer type ``T``:
 
 ``type(T).min``

libsolidity/analysis/TypeChecker.cpp

@@ -3027,11 +3027,11 @@ bool TypeChecker::visit(Identifier const& _identifier)
 		if (magicVar->type()->category() == Type::Category::Integer)
 		{
 			solAssert(_identifier.name() == "now", "");
-			m_errorReporter
-				.typeError(
-					_identifier.location(),
-					"\"now\" has been deprecated. Use \"block.timestamp\" instead."
-				);
+			m_errorReporter.typeError(
+				7359_error,
+				_identifier.location(),
+				"\"now\" has been deprecated. Use \"block.timestamp\" instead."
+			);
 		}
 
 	return false;

test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol

@@ -22,6 +22,8 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f() -> FAILURE
 // g() -> FAILURE

test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol

@@ -37,6 +37,8 @@ contract test {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // sendAmount(uint256): 5 -> 5

test/libsolidity/semanticTests/intheritance/value_for_constructor.sol

@@ -38,6 +38,8 @@ contract Main {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // constructor(), 22 wei ->
 // getFlag() -> true

test/libsolidity/semanticTests/various/value_complex.sol

@@ -18,6 +18,8 @@ contract test {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // sendAmount(uint256): 5 -> 8

test/libsolidity/semanticTests/various/value_insane.sol

@@ -17,6 +17,8 @@ contract test {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // sendAmount(uint256): 5 -> 8

test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol

@@ -1,5 +1,3 @@
-pragma solidity ^0.6.0;
-
 pragma experimental ABIEncoderV2;
 
 contract Ownable {
@@ -25,4 +23,4 @@ contract Voting is Ownable {
     }
 }
 // ----
-// Warning: (324-340): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning: (299-315): Unused function parameter. Remove or comment out the variable name to silence this warning.