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 #3652 from ethereum/gasleft_v2

Browse Source 
Use StaticAnalyzer to deprecate msg.gas instead of conditionally remo…
This commit is contained in:
chriseth 2018-03-06 09:26:14 +01:00 committed by GitHub
commit f6c0daec14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libsolidity/analysis/StaticAnalyzer.cpp
View File

@ -139,6 +139,23 @@ bool StaticAnalyzer::visit(ExpressionStatement const& _statement)
bool StaticAnalyzer::visit(MemberAccess const& _memberAccess) bool StaticAnalyzer::visit(MemberAccess const& _memberAccess)
{ {
bool const v050 = m_currentContract->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050);
if (MagicType const* type = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type.get()))
if (type->kind() == MagicType::Kind::Message && _memberAccess.memberName() == "gas")
{
if (v050)
m_errorReporter.typeError(
_memberAccess.location(),
"\"msg.gas\" has been deprecated in favor of \"gasleft()\""
);
else
m_errorReporter.warning(
_memberAccess.location(),
"\"msg.gas\" has been deprecated in favor of \"gasleft()\""
);
}
if (m_nonPayablePublic && !m_library) if (m_nonPayablePublic && !m_library)
if (MagicType const* type = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type.get())) if (MagicType const* type = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type.get()))
if (type->kind() == MagicType::Kind::Message && _memberAccess.memberName() == "value") if (type->kind() == MagicType::Kind::Message && _memberAccess.memberName() == "value")
@ -151,7 +168,7 @@ bool StaticAnalyzer::visit(MemberAccess const& _memberAccess)
if (auto const* type = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get())) if (auto const* type = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get()))
if (type->kind() == FunctionType::Kind::BareCallCode) if (type->kind() == FunctionType::Kind::BareCallCode)
{ {
if (m_currentContract->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050)) if (v050)
m_errorReporter.typeError( m_errorReporter.typeError(
_memberAccess.location(), _memberAccess.location(),
"\"callcode\" has been deprecated in favour of \"delegatecall\"." "\"callcode\" has been deprecated in favour of \"delegatecall\"."

14
libsolidity/ast/Types.cpp
View File

@ -3000,10 +3000,8 @@ bool MagicType::operator==(Type const& _other) const
return other.m_kind == m_kind; return other.m_kind == m_kind;
} }
MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const* _contract) const MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const*) const
{ {
solAssert(_contract, "");
const bool v050 = _contract->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050);
switch (m_kind) switch (m_kind)
{ {
case Kind::Block: case Kind::Block:
@ -3016,17 +3014,13 @@ MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const* _contra
{"gaslimit", make_shared<IntegerType>(256)} {"gaslimit", make_shared<IntegerType>(256)}
}); });
case Kind::Message: case Kind::Message:
{ return MemberList::MemberMap({
std::vector<MemberList::Member> members = {
{"sender", make_shared<IntegerType>(160, IntegerType::Modifier::Address)}, {"sender", make_shared<IntegerType>(160, IntegerType::Modifier::Address)},
{"gas", make_shared<IntegerType>(256)},
{"value", make_shared<IntegerType>(256)}, {"value", make_shared<IntegerType>(256)},
{"data", make_shared<ArrayType>(DataLocation::CallData)}, {"data", make_shared<ArrayType>(DataLocation::CallData)},
{"sig", make_shared<FixedBytesType>(4)} {"sig", make_shared<FixedBytesType>(4)}
}; });
if (!v050)
members.emplace_back("gas", make_shared<IntegerType>(256));
return members;
}
case Kind::Transaction: case Kind::Transaction:
return MemberList::MemberMap({ return MemberList::MemberMap({
{"origin", make_shared<IntegerType>(160, IntegerType::Modifier::Address)}, {"origin", make_shared<IntegerType>(160, IntegerType::Modifier::Address)},

5
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -924,8 +924,6 @@ bool ExpressionCompiler::visit(NewExpression const&)
bool ExpressionCompiler::visit(MemberAccess const& _memberAccess) bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
{ {
bool const v050 = m_context.experimentalFeatureActive(ExperimentalFeature::V050);
CompilerContext::LocationSetter locationSetter(m_context, _memberAccess); CompilerContext::LocationSetter locationSetter(m_context, _memberAccess);
// Check whether the member is a bound function. // Check whether the member is a bound function.
ASTString const& member = _memberAccess.memberName(); ASTString const& member = _memberAccess.memberName();
@ -1141,10 +1139,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
else if (member == "origin") else if (member == "origin")
m_context << Instruction::ORIGIN; m_context << Instruction::ORIGIN;
else if (member == "gas") else if (member == "gas")
{
solAssert(!v050, "");
m_context << Instruction::GAS; m_context << Instruction::GAS;
}
else if (member == "gasprice") else if (member == "gasprice")
m_context << Instruction::GASPRICE; m_context << Instruction::GASPRICE;
else if (member == "data") else if (member == "data")

4
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -7417,7 +7417,7 @@ BOOST_AUTO_TEST_CASE(gasleft)
function f() public view returns (uint256 val) { return msg.gas; } function f() public view returns (uint256 val) { return msg.gas; }
} }
)"; )";
CHECK_SUCCESS_NO_WARNINGS(text); CHECK_WARNING(text, "\"msg.gas\" has been deprecated in favor of \"gasleft()\"");
text = R"( text = R"(
contract C { contract C {
@ -7432,7 +7432,7 @@ BOOST_AUTO_TEST_CASE(gasleft)
function f() public returns (uint256 val) { return msg.gas; } function f() public returns (uint256 val) { return msg.gas; }
} }
)"; )";
CHECK_ERROR(text, TypeError, "Member \"gas\" not found or not visible after argument-dependent lookup in msg"); CHECK_ERROR(text, TypeError, "\"msg.gas\" has been deprecated in favor of \"gasleft()\"");
} }
BOOST_AUTO_TEST_CASE(gasleft_shadowing) BOOST_AUTO_TEST_CASE(gasleft_shadowing)