Test: Add universal host for compilers under test

Author: erak

test/CMakeLists.txt

@@ -121,6 +121,8 @@ set(libsolidity_util_sources
     libsolidity/util/compiler/Compiler.cpp
     libsolidity/util/compiler/InternalCompiler.h
     libsolidity/util/compiler/InternalCompiler.cpp
+    libsolidity/util/compiler/CompilerHost.h
+    libsolidity/util/compiler/CompilerHost.cpp
     libsolidity/util/BytesUtils.cpp
     libsolidity/util/BytesUtilsTests.cpp
     libsolidity/util/BytesUtils.h

test/libsolidity/util/compiler/CompilerHost.cpp

@@ -0,0 +1,25 @@
+#include <test/libsolidity/util/compiler/CompilerHost.h>
+
+using namespace solidity;
+using namespace solidity::frontend::test;
+
+CompilerOutput const& CompilerHost::compile(CompilerInput _input)
+{
+    auto compile = [=](auto& compiler) { return compiler.compile(_input); };
+    auto output = std::visit(compile, m_compiler);
+
+    m_output.emplace(output);
+
+    return this->output();
+}
+
+void CompilerHost::reset()
+{
+    m_output.reset();
+}
+
+CompilerOutput const& CompilerHost::output() const
+{
+    solAssert(m_output.has_value(), "No output found. Please compile first.");
+    return m_output.value();
+}

test/libsolidity/util/compiler/CompilerHost.h

@@ -0,0 +1,48 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+
+#pragma once
+
+#include <test/libsolidity/util/compiler/Compiler.h>
+#include <test/libsolidity/util/compiler/InternalCompiler.h>
+
+namespace solidity::frontend::test
+{
+
+class CompilerHost
+{
+public:
+    /// Takes the current compiler input, requests the hosted compiler to compile
+    /// and updates the output accordingly.
+    CompilerOutput const& compile(CompilerInput _input);
+
+    /// Resets the output generated by the previous compilation.
+    void reset();
+
+    /// @returns the stored output generated by the previous compilation.
+    CompilerOutput const& output() const;
+
+private:
+    /// Instance of an invocable compiler.
+    std::variant<InternalCompiler> m_compiler;
+    /// Last generated output. Will be none before initial compilation
+    /// and after reset.
+    std::optional<CompilerOutput> m_output;
+};
+
+}

test/tools/CMakeLists.txt

@@ -25,6 +25,8 @@ add_executable(isoltest
 	../libsolidity/util/TestFunctionCall.cpp
 	../libsolidity/util/compiler/Compiler.h
 	../libsolidity/util/compiler/Compiler.cpp
+	../libsolidity/util/compiler/CompilerHost.h
+	../libsolidity/util/compiler/CompilerHost.cpp
 	../libsolidity/util/compiler/InternalCompiler.h
 	../libsolidity/util/compiler/InternalCompiler.cpp
 	../libsolidity/GasTest.cpp