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

Merge pull request #10945 from ethereum/constructor-modifier-bugfix

Browse Source 
Fix IR bug about calling the wrong modifier during construction
This commit is contained in:
Harikrishnan Mulackal 2021-02-10 21:42:45 +01:00 committed by GitHub
commit 215233d5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/codegen/ir/IRGenerator.cpp
View File

@ -727,7 +727,7 @@ void IRGenerator::generateImplicitConstructors(ContractDefinition const& _contra
generateModifier(modifier, *constructor, next);
}
body =
IRNames::modifierInvocation(*constructor->modifiers().at(0)) +
IRNames::modifierInvocation(*realModifiers.at(0)) +
"(" +
joinHumanReadable(params) +
")";

7
test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol Normal file
View File

@ -0,0 +1,7 @@
// The IR of this contract used to throw
contract A { modifier m1{_;} }
contract B is A { constructor() A() m1{} }
// ====
// compileViaYul: also
// ----
// constructor() ->

13
test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol Normal file
View File

@ -0,0 +1,13 @@
// The IR of this contract used to throw
contract A {
constructor() m1 { }
modifier m1 { _; }
}
contract B is A {
modifier m2 { _; }
constructor() A() m1 m2 { }
}
// ====
// compileViaYul: also
// ----
// constructor() ->