cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup! Type inference draft.

Browse Source 
Rebase fixes
This commit is contained in:
Kamil Śliwak 2023-09-13 14:26:55 +02:00 committed by Nikola Matic
parent 0e95ca163c
commit acad00f461
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/experimental/ast/TypeSystem.cpp
View File

@ -138,7 +138,7 @@ TypeSystem::TypeSystem()
for (auto [type, name, arity]: std::initializer_list<std::tuple<PrimitiveType, char const*, size_t>>{ for (auto [type, name, arity]: std::initializer_list<std::tuple<PrimitiveType, char const*, size_t>>{
{PrimitiveType::TypeFunction, "tfun", 2}, {PrimitiveType::TypeFunction, "tfun", 2},
{PrimitiveType::Function, "fun", 2}, {PrimitiveType::Function, "fun", 2},
{PrimitiveType::Function, "itself", 1}, {PrimitiveType::Itself, "itself", 1},
{PrimitiveType::Void, "void", 0}, {PrimitiveType::Void, "void", 0},
{PrimitiveType::Unit, "unit", 0}, {PrimitiveType::Unit, "unit", 0},
{PrimitiveType::Pair, "pair", 2}, {PrimitiveType::Pair, "pair", 2},

3
libsolidity/interface/CompilerStack.cpp
View File

@ -1475,9 +1475,6 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
{ {
solAssert(m_stackState >= AnalysisSuccessful, ""); solAssert(m_stackState >= AnalysisSuccessful, "");
if (m_experimentalAnalysis)
solThrow(CompilerError, "IR codegen after experimental analysis is unsupported.");
Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName()); Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
if (!compiledContract.yulIR.empty()) if (!compiledContract.yulIR.empty())
return; return;