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

Remove assertions preventing calldata->calldata conversion when cleanup is needed

Browse Source
This commit is contained in:
Kamil Śliwak
2021-06-22 16:10:16 +02:00
parent ef0e902db3
commit 98e83303b1
8 changed files with 130 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/codegen/CompilerUtils.cpp
+3 -6
View File
@@ -1078,8 +1078,7 @@ void CompilerUtils::convertType(
}
case DataLocation::CallData:
solAssert(
targetType.isByteArray() &&
typeOnStack.isByteArray() &&
((targetType.isByteArray() && typeOnStack.isByteArray()) || _typeOnStack == _targetType) &&
typeOnStack.location() == DataLocation::CallData,
"Invalid conversion to calldata type."
);
@@ -1130,9 +1129,6 @@ void CompilerUtils::convertType(
solAssert(targetTypeCategory == stackTypeCategory, "");
auto& targetType = dynamic_cast<StructType const&>(_targetType);
auto& typeOnStack = dynamic_cast<StructType const&>(_typeOnStack);
solAssert(
targetType.location() != DataLocation::CallData
, "");
switch (targetType.location())
{
case DataLocation::Storage:
@@ -1208,7 +1204,8 @@ void CompilerUtils::convertType(
}
break;
case DataLocation::CallData:
solAssert(false, "Invalid type conversion target location CallData.");
solAssert(_typeOnStack == _targetType, "");
// nothing to do
break;
}
break;