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

Revert with reason.

Browse Source
This commit is contained in:
chriseth 2019-05-09 12:22:37 +02:00
parent 60a42f58a0
commit 021b312264
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolidity/codegen/YulUtilFunctions.cpp
View File

@ -123,9 +123,6 @@ string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _mess
("functionName", functionName) ("functionName", functionName)
.render(); .render();
solUnimplemented("require() with two parameters is not yet implemented.");
// TODO The code below is completely untested as we don't support StringLiterals yet
int const hashHeaderSize = 4; int const hashHeaderSize = 4;
int const byteSize = 8; int const byteSize = 8;
u256 const errorHash = u256 const errorHash =
@ -140,20 +137,24 @@ string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _mess
); );
return Whiskers(R"( return Whiskers(R"(
function <functionName>(condition, message) { function <functionName>(condition <messageVars>) {
if iszero(condition) { if iszero(condition) {
let fmp := mload(<freeMemPointer>) let fmp := mload(<freeMemPointer>)
mstore(fmp, <errorHash>) mstore(fmp, <errorHash>)
let end := <abiEncodeFunc>(add(fmp, <hashHeaderSize>), message) let end := <abiEncodeFunc>(add(fmp, <hashHeaderSize>) <messageVars>)
revert(fmp, sub(end, fmp)) revert(fmp, sub(end, fmp))
} }
} }
)") )")
("functionName", functionName) ("functionName", functionName)
("freeMemPointer", to_string(CompilerUtils::freeMemoryPointer)) ("freeMemPointer", to_string(CompilerUtils::freeMemoryPointer))
("errorHash", errorHash.str()) ("errorHash", formatNumber(errorHash))
("abiEncodeFunc", encodeFunc) ("abiEncodeFunc", encodeFunc)
("hashHeaderSize", to_string(hashHeaderSize)) ("hashHeaderSize", to_string(hashHeaderSize))
("messageVars",
(_messageType->sizeOnStack() > 0 ? ", " : "") +
suffixedVariableNameList("message_", 1, 1 + _messageType->sizeOnStack())
)
.render(); .render();
}); });
} }