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 #7042 from ethereum/make-whiskers-fail-early

Browse Source 
Make Whiskers fail early when called with int
This commit is contained in:
chriseth 2019-07-04 12:19:54 +02:00 committed by GitHub
commit 2e01816c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdevcore/Whiskers.h
View File

@ -85,6 +85,8 @@ public:
std::string render() const; std::string render() const;
private: private:
// Prevent implicit cast to bool
Whiskers& operator()(std::string _parameter, long long);
void checkParameterValid(std::string const& _parameter) const; void checkParameterValid(std::string const& _parameter) const;
void checkParameterUnknown(std::string const& _parameter) const; void checkParameterUnknown(std::string const& _parameter) const;

2
libsolidity/codegen/YulUtilFunctions.cpp
View File

@ -655,7 +655,7 @@ string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
</byteArray> </byteArray>
})") })")
("functionName", functionName) ("functionName", functionName)
("elementSize", _type.location() == DataLocation::Memory ? baseType.memoryHeadSize() : baseType.calldataEncodedSize()) ("elementSize", to_string(_type.location() == DataLocation::Memory ? baseType.memoryHeadSize() : baseType.calldataEncodedSize()))
("byteArray", _type.isByteArray()) ("byteArray", _type.isByteArray())
("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256())) ("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256()))
.render(); .render();