diff options
author | chriseth <chris@ethereum.org> | 2017-05-05 20:25:43 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-05 20:25:43 +0800 |
commit | 0582fcb93b2407379b5e4e4ce55c3f418e7ff433 (patch) | |
tree | 2770da9c5727476ff8b1ad8559cb81335f25b400 /docs | |
parent | 2d89cfaa91bcc36db415b5c07f1bd821398da96e (diff) | |
parent | 28f10f4783bd4365654191740069a7112be03d92 (diff) | |
download | dexon-solidity-0582fcb93b2407379b5e4e4ce55c3f418e7ff433.tar.gz dexon-solidity-0582fcb93b2407379b5e4e4ce55c3f418e7ff433.tar.zst dexon-solidity-0582fcb93b2407379b5e4e4ce55c3f418e7ff433.zip |
Merge pull request #2194 from ethereum/removeerrorlabel
Remove error label / invalid jump label.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/assembly.rst | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/docs/assembly.rst b/docs/assembly.rst index 420cea17..07583a24 100644 --- a/docs/assembly.rst +++ b/docs/assembly.rst @@ -431,11 +431,6 @@ As an example how this can be done in extreme cases, please see the following. pop // We have to pop the manually pushed value here again. } -.. note:: - - ``invalidJumpLabel`` is a pre-defined label. Jumping to this location will always - result in an invalid jump, effectively aborting execution of the code. - Declaring Assembly-Local Variables ---------------------------------- @@ -699,7 +694,7 @@ The following assembly will be generated:: mstore(ret, r) return(ret, 0x20) } - default: { jump(invalidJumpLabel) } + default: { revert(0, 0) } // memory allocator function $allocate(size) -> pos { pos := mload(0x40) @@ -744,7 +739,7 @@ After the desugaring phase it looks as follows:: } $caseDefault: { - jump(invalidJumpLabel) + revert(0, 0) jump($endswitch) } $endswitch: |