From 08781eb8f53e79dfa66147653833811836f47210 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 12 Oct 2021 11:12:18 +0200
Subject: [PATCH] Extract contractAddressValue into own function

---
 libsolidity/formal/SMTEncoder.cpp | 11 +++++++++++
 libsolidity/formal/SMTEncoder.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 8c5dd647e..f716128d3 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -2781,6 +2781,17 @@ MemberAccess const* SMTEncoder::isEmptyPush(Expression const& _expr) const
 	return nullptr;
 }
 
+smtutil::Expression SMTEncoder::contractAddressValue(FunctionCall const& _f)
+{
+	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_f.expression().annotation().type);
+	if (funType.kind() == FunctionType::Kind::Internal)
+		return state().thisAddress();
+	auto [funExpr, funOptions] = functionCallExpression(_f);
+	if (MemberAccess const* callBase = dynamic_cast<MemberAccess const*>(funExpr))
+		return expr(callBase->expression());
+	solAssert(false, "Unreachable!");
+}
+
 bool SMTEncoder::isPublicGetter(Expression const& _expr) {
 	if (!isTrustedExternalCall(&_expr))
 		return false;
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 888bd6a3d..1c3196c8f 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -229,6 +229,8 @@ protected:
 
 	bool isPublicGetter(Expression const& _expr);
 
+	smtutil::Expression contractAddressValue(FunctionCall const& _f);
+
 	/// Encodes a modifier or function body according to the modifier
 	/// visit depth.
 	void visitFunctionOrModifier();