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

Merge pull request #12646 from ethereum/develop

Browse Source 
Merging develop into breaking.
This commit is contained in:
chriseth
2022-02-08 12:00:34 +01:00
committed by GitHub
parent b0c440f341 0e93456e30
commit 649029da92
49 changed files with 585 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/DeclarationTypeChecker.cpp
+1 -1
View File
@@ -441,7 +441,7 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
{
bool allowed = false;
if (auto arrayType = dynamic_cast<ArrayType const*>(type))
allowed = arrayType->isByteArray();
allowed = arrayType->isByteArrayOrString();
if (!allowed)
m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Only constants of value type and byte array type are implemented.");
}
libsolidity/analysis/TypeChecker.cpp
+2 -2
View File
@@ -1783,7 +1783,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
(
(
resultArrayType->isPointer() ||
(argArrayType->isByteArray() && resultArrayType->isByteArray())
(argArrayType->isByteArrayOrString() && resultArrayType->isByteArrayOrString())
) &&
resultArrayType->location() == DataLocation::Storage
),
@@ -1791,7 +1791,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
);
else
solAssert(
argArrayType->isByteArray() && !argArrayType->isString() && resultType->category() == Type::Category::FixedBytes,
argArrayType->isByteArray() && resultType->category() == Type::Category::FixedBytes,
""
);
}