cerc-io/solidity
15
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

Merge pull request #11864 from ethereum/protectViaIR

Browse Source 
Add protection against mixing "viaIR" and "non-viaIR".
This commit is contained in:
chriseth 2021-09-22 16:16:11 +02:00 committed by GitHub
commit 5a3a5c746f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/interface/CompilerStack.cpp
View File

@ -741,9 +741,10 @@ Json::Value CompilerStack::generatedSources(string const& _contractName, bool _r
return sources.init([&]{ return sources.init([&]{
Json::Value sources{Json::arrayValue}; Json::Value sources{Json::arrayValue};
// If there is no compiler, then no bytecode was generated and thus no // If there is no compiler, then no bytecode was generated and thus no
// sources were generated. // sources were generated (or we compiled "via IR").
if (c.compiler) if (c.compiler)
{ {
solAssert(!m_viaIR, "");
string source = string source =
_runtime ? _runtime ?
c.compiler->runtimeGeneratedYulUtilityCode() : c.compiler->runtimeGeneratedYulUtilityCode() :
@ -1251,6 +1252,7 @@ void CompilerStack::compileContract(
map<ContractDefinition const*, shared_ptr<Compiler const>>& _otherCompilers map<ContractDefinition const*, shared_ptr<Compiler const>>& _otherCompilers
) )
{ {
solAssert(!m_viaIR, "");
solAssert(m_stackState >= AnalysisPerformed, ""); solAssert(m_stackState >= AnalysisPerformed, "");
if (m_hasError) if (m_hasError)
BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Called compile with errors.")); BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Called compile with errors."));