tmp

libsolidity/CMakeLists.txt

@@ -46,6 +46,8 @@ set(sources
 	analysis/TypeChecker.h
 	analysis/ViewPureChecker.cpp
 	analysis/ViewPureChecker.h
+	analysis/experimental/Analysis.cpp
+	analysis/experimental/Analysis.h
 	ast/AST.cpp
 	ast/AST.h
 	ast/AST_accept.h
@@ -90,6 +92,8 @@ set(sources
 	codegen/ReturnInfo.cpp
 	codegen/YulUtilFunctions.h
 	codegen/YulUtilFunctions.cpp
+	codegen/experimental/IRGenerator.cpp
+	codegen/experimental/IRGenerator.h
 	codegen/ir/Common.cpp
 	codegen/ir/Common.h
 	codegen/ir/IRGenerator.cpp

libsolidity/analysis/experimental/Analysis.cpp

@@ -0,0 +1,26 @@
+/*
+	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
+#include <libsolidity/analysis/experimental/Analysis.h>
+
+using namespace solidity::langutil;
+using namespace solidity::frontend::experimental;
+
+bool Analysis::check(ASTNode const&)
+{
+	return true;
+}

libsolidity/analysis/experimental/Analysis.h

@@ -0,0 +1,43 @@
+/*
+	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
+
+namespace solidity::frontend
+{
+class ASTNode;
+}
+
+namespace solidity::langutil
+{
+class ErrorReporter;
+}
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis
+{
+public:
+	Analysis(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter)
+	{}
+	bool check(ASTNode const& _ast);
+private:
+	langutil::ErrorReporter& m_errorReporter;
+};
+
+}

libsolidity/codegen/experimental/IRGenerator.cpp

@@ -0,0 +1,160 @@
+/*
+	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
+
+#include <libsolidity/codegen/experimental/IRGenerator.h>
+
+#include <libsolidity/codegen/ir/Common.h>
+
+#include <libyul/YulStack.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
+#include <libyul/optimiser/ASTCopier.h>
+
+#include <liblangutil/SourceReferenceFormatter.h>
+
+#include <libsolutil/Whiskers.h>
+
+#include <variant>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+using namespace solidity::util;
+
+string IRGenerator::run(
+	ContractDefinition const& _contract,
+	bytes const& /*_cborMetadata*/,
+	map<ContractDefinition const*, string_view const> const& /*_otherYulSources*/
+) const
+{
+
+	Whiskers t(R"(
+		object "<CreationObject>" {
+			code {
+				codecopy(0, dataoffset("<DeployedObject>"), datasize("<DeployedObject>"))
+				return(0, datasize("<DeployedObject>"))
+			}
+			object "<DeployedObject>" {
+				code {
+					<code>
+				}
+			}
+		}
+	)");
+	t("CreationObject", IRNames::creationObject(_contract));
+	t("DeployedObject", IRNames::deployedObject(_contract));
+	t("code", generate(_contract));
+
+	return t.render();
+}
+
+string IRGenerator::generate(ContractDefinition const& _contract) const
+{
+	std::stringstream code;
+	code << "{\n";
+	if (_contract.fallbackFunction())
+	{
+		code << IRNames::function(*_contract.fallbackFunction()) << "()\n";
+	}
+	code << "revert(0,0)\n";
+	code << "}\n";
+
+	for (FunctionDefinition const* f: _contract.definedFunctions())
+		code << generate(*f);
+
+	return code.str();
+}
+
+string IRGenerator::generate(FunctionDefinition const& _function) const
+{
+	std::stringstream code;
+	code << "function " << IRNames::function(_function) << "() {\n";
+	for (auto _statement: _function.body().statements())
+	{
+		if (auto assembly = dynamic_cast<InlineAssembly const*>(_statement.get()))
+			code << generate(*assembly) << "\n";
+		else
+			solUnimplemented("Unsupported statement type.");
+	}
+	code << "}\n";
+	return code.str();
+}
+
+namespace {
+
+struct CopyTranslate: public yul::ASTCopier
+{
+	CopyTranslate(
+		yul::Dialect const& _dialect,
+		map<yul::Identifier const*, void*> _references
+	): m_dialect(_dialect), m_references(std::move(_references)) {}
+
+	using ASTCopier::operator();
+
+	yul::Expression operator()(yul::Identifier const& _identifier) override
+	{
+		// The operator() function is only called in lvalue context. In rvalue context,
+		// only translate(yul::Identifier) is called.
+		if (m_references.count(&_identifier))
+			return translateReference(_identifier);
+		else
+			return ASTCopier::operator()(_identifier);
+	}
+
+	yul::YulString translateIdentifier(yul::YulString _name) override
+	{
+		if (m_dialect.builtin(_name))
+			return _name;
+		else
+			return yul::YulString{"usr$" + _name.str()};
+	}
+
+	yul::Identifier translate(yul::Identifier const& _identifier) override
+	{
+		if (!m_references.count(&_identifier))
+			return ASTCopier::translate(_identifier);
+
+		yul::Expression translated = translateReference(_identifier);
+		solAssert(holds_alternative<yul::Identifier>(translated));
+		return get<yul::Identifier>(std::move(translated));
+	}
+
+private:
+
+	/// Translates a reference to a local variable, potentially including
+	/// a suffix. Might return a literal, which causes this to be invalid in
+	/// lvalue-context.
+	yul::Expression translateReference(yul::Identifier const&)
+	{
+		solUnimplemented("External references in inline assembly not implemented.");
+	}
+
+	yul::Dialect const& m_dialect;
+	map<yul::Identifier const*, void*> m_references;
+};
+
+}
+
+string IRGenerator::generate(InlineAssembly const& _assembly) const
+{
+	CopyTranslate bodyCopier{_assembly.dialect(), {}};
+	yul::Statement modified = bodyCopier(_assembly.operations());
+	solAssert(holds_alternative<yul::Block>(modified));
+	return yul::AsmPrinter()(std::get<yul::Block>(modified));
+}

libsolidity/codegen/experimental/IRGenerator.h

@@ -0,0 +1,73 @@
+/*
+	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 <libsolidity/interface/DebugSettings.h>
+#include <libsolidity/interface/OptimiserSettings.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/ast/CallGraph.h>
+
+#include <liblangutil/CharStreamProvider.h>
+#include <liblangutil/DebugInfoSelection.h>
+#include <liblangutil/EVMVersion.h>
+
+#include <json/json.h>
+
+#include <string>
+
+namespace solidity::frontend::experimental
+{
+
+class SourceUnit;
+
+class IRGenerator
+{
+public:
+	IRGenerator(
+		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
+		RevertStrings /*_revertStrings*/,
+		std::map<std::string, unsigned> /*_sourceIndices*/,
+		langutil::DebugInfoSelection const& _debugInfoSelection,
+		langutil::CharStreamProvider const* _soliditySourceProvider
+	):
+		m_evmVersion(_evmVersion),
+		m_eofVersion(_eofVersion),
+		m_debugInfoSelection(_debugInfoSelection),
+		m_soliditySourceProvider(_soliditySourceProvider)
+	{}
+
+	std::string run(
+		ContractDefinition const& _contract,
+		bytes const& _cborMetadata,
+		std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
+	) const;
+
+	std::string generate(ContractDefinition const& _contract) const;
+	std::string generate(FunctionDefinition const& _function) const;
+	std::string generate(InlineAssembly const& _assembly) const;
+private:
+	langutil::EVMVersion const m_evmVersion;
+	std::optional<uint8_t> const m_eofVersion;
+	OptimiserSettings const m_optimiserSettings;
+	langutil::DebugInfoSelection m_debugInfoSelection = {};
+	langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr;
+};
+
+}

libsolidity/interface/CompilerStack.cpp

@@ -44,6 +44,8 @@
 #include <libsolidity/analysis/ViewPureChecker.h>
 #include <libsolidity/analysis/ImmutableValidator.h>
 
+#include <libsolidity/analysis/experimental/Analysis.h>
+
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolidity/ast/ASTJsonImporter.h>
@@ -56,6 +58,8 @@
 #include <libsolidity/interface/Version.h>
 #include <libsolidity/parsing/Parser.h>
 
+#include <libsolidity/codegen/experimental/IRGenerator.h>
+
 #include <libsolidity/codegen/ir/Common.h>
 #include <libsolidity/codegen/ir/IRGenerator.h>
 
@@ -326,6 +330,7 @@ void CompilerStack::reset(bool _keepSettings)
 		m_metadataHash = MetadataHash::IPFS;
 		m_stopAfter = State::CompilationSuccessful;
 	}
+	m_experimentalAnalysis.reset();
 	m_globalContext.reset();
 	m_sourceOrder.clear();
 	m_contracts.clear();
@@ -487,6 +492,33 @@ bool CompilerStack::analyze()
 			if (source->ast && !resolver.resolveNamesAndTypes(*source->ast))
 				return false;
 
+		if (!m_sourceOrder.empty() && m_sourceOrder.front()->ast->experimentalSolidity())
+		{
+			if (!analyzeExperimental())
+				noErrors = false;
+		}
+		else if (!analyzeLegacy(noErrors))
+			noErrors = false;
+
+		m_stackState = AnalysisPerformed;
+	}
+	catch (FatalError const&)
+	{
+		if (m_errorReporter.errors().empty())
+			throw; // Something is weird here, rather throw again.
+		noErrors = false;
+	}
+
+	if (!noErrors)
+		m_hasError = true;
+
+	return !m_hasError;
+}
+
+bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
+{
+	bool noErrors = _noErrorsSoFar;
+
 	DeclarationTypeChecker declarationTypeChecker(m_errorReporter, m_evmVersion);
 	for (Source const* source: m_sourceOrder)
 		if (source->ast && !declarationTypeChecker.check(*source->ast))
@@ -626,19 +658,18 @@ bool CompilerStack::analyze()
 		m_unhandledSMTLib2Queries += modelChecker.unhandledQueries();
 	}
 
-		m_stackState = AnalysisPerformed;
+	return noErrors;
 }
-	catch (FatalError const&)
+
+bool CompilerStack::analyzeExperimental()
 {
-		if (m_errorReporter.errors().empty())
+	bool noErrors = true;
-			throw; // Something is weird here, rather throw again.
+	m_experimentalAnalysis = make_unique<experimental::Analysis>(m_errorReporter);
+	for (Source const* source: m_sourceOrder)
+		if (source->ast)
+			if (!m_experimentalAnalysis->check(*source->ast))
 				noErrors = false;
-	}
+	return noErrors;
-
-	if (!noErrors)
-		m_hasError = true;
-
-	return !m_hasError;
 }
 
 bool CompilerStack::parseAndAnalyze(State _stopAfter)
@@ -708,9 +739,13 @@ bool CompilerStack::compile(State _stopAfter)
 							if (m_viaIR)
 								generateEVMFromIR(*contract);
 							else
+							{
+								if (m_experimentalAnalysis)
+									solThrow(CompilerError, "Legacy codegen after experimental analysis is unsupported.");
 								compileContract(*contract, otherCompilers);
 							}
 						}
+					}
 					catch (Error const& _error)
 					{
 						if (_error.type() != Error::Type::CodeGenerationError)
@@ -1471,6 +1506,24 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 	for (auto const& pair: m_contracts)
 		otherYulSources.emplace(pair.second.contract, pair.second.yulIR);
 
+	if (m_experimentalAnalysis)
+	{
+		experimental::IRGenerator generator(
+			m_evmVersion,
+			m_eofVersion,
+			m_revertStrings,
+			sourceIndices(),
+			m_debugInfoSelection,
+			this
+		);
+		compiledContract.yulIR = generator.run(
+			_contract,
+			{}, // TODO: createCBORMetadata(compiledContract, /* _forIR */ true),
+			otherYulSources
+		);
+	}
+	else
+	{
 		IRGenerator generator(
 			m_evmVersion,
 			m_eofVersion,
@@ -1484,6 +1537,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 			createCBORMetadata(compiledContract, /* _forIR */ true),
 			otherYulSources
 		);
+	}
 
 	yul::YulStack stack(
 		m_evmVersion,

libsolidity/interface/CompilerStack.h

@@ -81,6 +81,10 @@ class Compiler;
 class GlobalContext;
 class Natspec;
 class DeclarationContainer;
+namespace experimental
+{
+class Analysis;
+}
 
 /**
  * Easy to use and self-contained Solidity compiler with as few header dependencies as possible.
@@ -235,6 +239,13 @@ public:
 	/// @returns false on error.
 	bool analyze();
 
+	/// Perform the analysis steps of legacy language mode.
+	/// @returns false on error.
+	bool analyzeLegacy(bool _noErrorsSoFar);
+	/// Perform the analysis steps of experimental language mode.
+	/// @returns false on error.
+	bool analyzeExperimental();
+
 	/// Parses and analyzes all source units that were added
 	/// @returns false on error.
 	bool parseAndAnalyze(State _stopAfter = State::CompilationSuccessful);
@@ -514,6 +525,7 @@ private:
 
 	langutil::ErrorList m_errorList;
 	langutil::ErrorReporter m_errorReporter;
+	std::unique_ptr<experimental::Analysis> m_experimentalAnalysis;
 	bool m_metadataLiteralSources = false;
 	MetadataHash m_metadataHash = MetadataHash::IPFS;
 	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();