diff --git a/Changelog.md b/Changelog.md index edd218d31..5ffb45f78 100644 --- a/Changelog.md +++ b/Changelog.md @@ -21,8 +21,6 @@ Bugfixes: * SMTChecker: Fix bug when z3 is selected but not available at runtime. * SMTChecker: Fix ABI compatibility with z3 >=4.8.16. * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``. - * View Pure Checker: Mark ``returndatasize`` and ``returndatacopy`` as view to disallow them in inline assembly blocks in pure functions. - ### 0.8.13 (2022-03-16) diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp index a2a2b1af2..acbcaa5c0 100644 --- a/libevmasm/SemanticInformation.cpp +++ b/libevmasm/SemanticInformation.cpp @@ -479,8 +479,6 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction) case Instruction::EXTCODESIZE: case Instruction::EXTCODECOPY: case Instruction::EXTCODEHASH: - case Instruction::RETURNDATASIZE: - case Instruction::RETURNDATACOPY: case Instruction::BLOCKHASH: case Instruction::COINBASE: case Instruction::TIMESTAMP: diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol index 28d336577..b08172ebe 100644 --- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol +++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol @@ -1,5 +1,5 @@ contract C { - function f() view external { + function f() pure external { assembly { let s := returndatasize() returndatacopy(0, 0, s) diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol index 5698f990f..74316c526 100644 --- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol +++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol @@ -1,5 +1,5 @@ contract C { - function f() view external { + function f() pure external { assembly { let s := returndatasize() returndatacopy(0, 0, s) diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol index 403022846..f959537b6 100644 --- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol +++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol @@ -1,5 +1,5 @@ contract C { - function f() public view { + function f() public pure { uint returndatasize; returndatasize; assembly { diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol index 903da7223..44a12aa06 100644 --- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol +++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol @@ -1,5 +1,5 @@ contract C { - function f() public view { + function f() public pure { uint returndatasize; returndatasize; assembly { diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol index 250a0755f..07bae8ac8 100644 --- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol +++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol @@ -1,4 +1,4 @@ -contract C { function f() public view { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}} +contract C { function f() public pure { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}} // ==== // EVMVersion: =homestead // ---- diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol index 9c09bcc37..85d7b6300 100644 --- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol +++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol @@ -47,8 +47,8 @@ contract C { codecopy(0, 1, 2) //pop(extcodesize(0)) //extcodecopy(0, 1, 2, 3) - //pop(returndatasize()) - //returndatacopy(0, 1, 2) + pop(returndatasize()) + returndatacopy(0, 1, 2) //pop(extcodehash(0)) //pop(create(0, 1, 2)) //pop(create2(0, 1, 2, 3)) @@ -85,6 +85,6 @@ contract C { // ==== // EVMVersion: >=london // ---- -// Warning 5740: (94-1759): Unreachable code. -// Warning 5740: (1772-1784): Unreachable code. -// Warning 5740: (1827-1836): Unreachable code. +// Warning 5740: (94-1755): Unreachable code. +// Warning 5740: (1768-1780): Unreachable code. +// Warning 5740: (1823-1832): Unreachable code. diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol index 8da17390d..f9a652fdb 100644 --- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol +++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol @@ -11,8 +11,6 @@ contract C { pop(callvalue()) pop(extcodesize(0)) extcodecopy(0, 1, 2, 3) - pop(returndatasize()) - returndatacopy(0, 1, 2) pop(extcodehash(0)) pop(create(0, 1, 2)) pop(create2(0, 1, 2, 3)) @@ -46,7 +44,7 @@ contract C { // ==== // EVMVersion: >=london // ---- -// Warning 5740: (742-1153): Unreachable code. +// Warning 5740: (672-1083): Unreachable code. // TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". // TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state. // TypeError 2527: (130-135): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". @@ -57,28 +55,26 @@ contract C { // TypeError 2527: (265-276): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". // TypeError 2527: (294-308): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". // TypeError 2527: (322-345): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (362-378): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (392-415): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (432-446): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 8961: (464-479): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (497-516): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (534-559): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (577-606): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (624-654): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 2527: (672-700): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 8961: (714-729): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (742-752): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (765-778): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (791-807): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (820-839): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 8961: (852-874): Function cannot be declared as pure because this expression (potentially) modifies the state. -// TypeError 2527: (891-900): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (918-927): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (945-953): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (971-981): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (999-1011): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (1029-1039): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (1057-1068): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (1086-1094): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (1112-1124): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". -// TypeError 2527: (1142-1152): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (362-376): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 8961: (394-409): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (427-446): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (464-489): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (507-536): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (554-584): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 2527: (602-630): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 8961: (644-659): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (672-682): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (695-708): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (721-737): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (750-769): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 8961: (782-804): Function cannot be declared as pure because this expression (potentially) modifies the state. +// TypeError 2527: (821-830): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (848-857): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (875-883): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (901-911): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (929-941): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (959-969): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (987-998): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (1016-1024): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (1042-1054): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view". +// TypeError 2527: (1072-1082): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".