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

Encode storage items correctly for library calls.

Browse Source
This commit is contained in:
chriseth
2015-10-06 14:20:06 +02:00
parent 421dcf4c1a
commit ce25ddfa6a
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/CompilerUtils.cpp
+8 -1
View File
@@ -189,7 +189,14 @@ void CompilerUtils::encodeToMemory(
copyToStackTop(argSize - stackPos + dynPointers + 2, _givenTypes[i]->sizeOnStack());
solAssert(!!targetType, "Externalable type expected.");
TypePointer type = targetType;
if (
if (_givenTypes[i]->dataStoredIn(DataLocation::Storage) && targetType->isValueType())
{
// special case: convert storage reference type to value type - this is only
// possible for library calls where we just forward the storage reference
solAssert(_encodeAsLibraryTypes, "");
solAssert(_givenTypes[i]->sizeOnStack() == 1, "");
}
else if (
_givenTypes[i]->dataStoredIn(DataLocation::Storage) ||
_givenTypes[i]->dataStoredIn(DataLocation::CallData) ||
_givenTypes[i]->category() == Type::Category::StringLiteral
libsolidity/ExpressionCompiler.cpp
+2 -1
View File
@@ -1179,7 +1179,8 @@ void ExpressionCompiler::appendExternalFunctionCall(
argumentTypes,
_functionType.parameterTypes(),
_functionType.padArguments(),
_functionType.takesArbitraryParameters()
_functionType.takesArbitraryParameters(),
isCallCode
);
// Stack now: