Merge pull request #4321 from ethereum/contractConversion

[BREAKING] Disallow conversion between unrelated contract types.

1 files changed, 4 insertions, 4 deletions

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 223250fa..e9e7c93b 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -9420,7 +9420,7 @@ BOOST_AUTO_TEST_CASE(failed_create)
 		contract C {
 			uint public x;
 			constructor() public payable {}
-			function f(uint amount) public returns (address) {
+			function f(uint amount) public returns (D) {
 				x++;
 				return (new D).value(amount)();
 			}
@@ -9428,7 +9428,7 @@ BOOST_AUTO_TEST_CASE(failed_create)
 				if (depth < 1024)
 					return this.stack(depth - 1);
 				else
-					return f(0);
+					return address(f(0));
 			}
 		}
 	)";
@@ -12524,10 +12524,10 @@ BOOST_AUTO_TEST_CASE(staticcall_for_view_and_pure)
 				return (new C()).f();
 			}
 			function fview() public returns (uint) {
-				return (CView(new C())).f();
+				return (CView(address(new C()))).f();
 			}
 			function fpure() public returns (uint) {
-				return (CPure(new C())).f();
+				return (CPure(address(new C()))).f();
 			}
 		}
 	)";