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 #2556 from ethereum/inlineasm-calldata

Browse Source 
Issue proper warning trying to access calldata variables in inline assembly
This commit is contained in:
chriseth 2017-07-12 15:02:20 +02:00 committed by GitHub
commit fca8d781b4
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -1,6 +1,7 @@
### 0.4.14 (unreleased) ### 0.4.14 (unreleased)
Features: Features:
* Inline Assembly: Show useful error message if trying to access calldata variables.
Bugfixes: Bugfixes:
* Type Checker: Fix invalid "specify storage keyword" warning for reference members of structs. * Type Checker: Fix invalid "specify storage keyword" warning for reference members of structs.

5
libsolidity/analysis/TypeChecker.cpp
View File

@ -723,7 +723,10 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
} }
else if (var->type()->sizeOnStack() != 1) else if (var->type()->sizeOnStack() != 1)
{ {
m_errorReporter.typeError(_identifier.location, "Only types that use one stack slot are supported."); if (var->type()->dataStoredIn(DataLocation::CallData))
m_errorReporter.typeError(_identifier.location, "Call data elements cannot be accessed directly. Copy to a local variable first or use \"calldataload\" or \"calldatacopy\" with manually determined offsets and sizes.");
else
m_errorReporter.typeError(_identifier.location, "Only types that use one stack slot are supported.");
return size_t(-1); return size_t(-1);
} }
} }

14
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -5428,6 +5428,20 @@ BOOST_AUTO_TEST_CASE(inline_assembly_storage_variable_access_out_of_functions)
CHECK_SUCCESS_NO_WARNINGS(text); CHECK_SUCCESS_NO_WARNINGS(text);
} }
BOOST_AUTO_TEST_CASE(inline_assembly_calldata_variables)
{
char const* text = R"(
contract C {
function f(bytes bytesAsCalldata) external {
assembly {
let x := bytesAsCalldata
}
}
}
)";
CHECK_ERROR(text, TypeError, "Call data elements cannot be accessed directly.");
}
BOOST_AUTO_TEST_CASE(invalid_mobile_type) BOOST_AUTO_TEST_CASE(invalid_mobile_type)
{ {
char const* text = R"( char const* text = R"(