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 #9849 from ethereum/fixIce9817

Browse Source 
Fixing ICE on returning struct with mapping from library
This commit is contained in:
chriseth 2020-10-14 00:05:19 +02:00 committed by GitHub
commit 8d241fece9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -11,6 +11,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* Code generator: Fix internal error on returning structs containing mappings from library function.
* Code generator: Fix internal compiler error when referencing members via module name but not using the reference. * Code generator: Fix internal compiler error when referencing members via module name but not using the reference.
* Code generator: Fix ``ABIEncoderV2`` pragma from the current module affecting inherited functions and applied modifiers. * Code generator: Fix ``ABIEncoderV2`` pragma from the current module affecting inherited functions and applied modifiers.
* Type Checker: Fix internal compiler error caused by storage parameters with nested mappings in libraries. * Type Checker: Fix internal compiler error caused by storage parameters with nested mappings in libraries.

5
libsolidity/ast/Types.cpp
View File

@ -3001,8 +3001,11 @@ TypePointers FunctionType::returnParameterTypesWithoutDynamicTypes() const
m_kind == Kind::BareStaticCall m_kind == Kind::BareStaticCall
) )
for (auto& param: returnParameterTypes) for (auto& param: returnParameterTypes)
if (param->isDynamicallyEncoded() && !param->dataStoredIn(DataLocation::Storage)) {
solAssert(param->decodingType(), "");
if (param->decodingType()->isDynamicallyEncoded())
param = TypeProvider::inaccessibleDynamic(); param = TypeProvider::inaccessibleDynamic();
}
return returnParameterTypes; return returnParameterTypes;
} }

9
libsolidity/codegen/ReturnInfo.cpp
View File

@ -41,16 +41,17 @@ ReturnInfo::ReturnInfo(EVMVersion const& _evmVersion, FunctionType const& _funct
returnTypes = _functionType.returnParameterTypesWithoutDynamicTypes(); returnTypes = _functionType.returnParameterTypesWithoutDynamicTypes();
for (auto const& retType: returnTypes) for (auto const& retType: returnTypes)
if (retType->isDynamicallyEncoded()) {
solAssert(retType->decodingType(), "");
if (retType->decodingType()->isDynamicallyEncoded())
{ {
solAssert(haveReturndatacopy, ""); solAssert(haveReturndatacopy, "");
dynamicReturnSize = true; dynamicReturnSize = true;
estimatedReturnSize = 0; estimatedReturnSize = 0;
break; break;
} }
else if (retType->decodingType())
estimatedReturnSize += retType->decodingType()->calldataEncodedSize();
else else
estimatedReturnSize += retType->calldataEncodedSize(); estimatedReturnSize += retType->decodingType()->calldataEncodedSize();
}
} }
} }

21
test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol Normal file
View File

@ -0,0 +1,21 @@
pragma experimental ABIEncoderV2;
library Lib {
struct Items {
mapping (uint => uint) a;
}
function get() public returns (Items storage x) {
assembly { x.slot := 123 }
}
}
contract C {
function f() public returns(uint256 slot) {
Lib.Items storage ptr = Lib.get();
assembly { slot := ptr.slot }
}
}
// ----
// library: Lib
// f() -> 123