diff options
| author | Daniel Kirchner <daniel@ekpyron.org> | 2018-03-03 00:58:27 +0800 |
|---|---|---|
| committer | Daniel Kirchner <daniel@ekpyron.org> | 2018-03-05 18:18:04 +0800 |
| commit | c633c0eacba12e940b12c6ff58b5c6c55dc0122c (patch) | |
| tree | 9b54278c28df1c2fb97916c9ec7e263faea1b97d /libsolidity/codegen/ExpressionCompiler.cpp | |
| parent | 5982869e94965e48ec680fd32e6f80b8211fc34c (diff) | |
| download | dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.tar dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.tar.gz dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.tar.bz2 dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.tar.lz dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.tar.xz dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.tar.zst dexon-solidity-c633c0eacba12e940b12c6ff58b5c6c55dc0122c.zip | |
Move msg.gas to global function gasleft(). Closes #2971.
Diffstat (limited to 'libsolidity/codegen/ExpressionCompiler.cpp')
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index 61920592..d3599367 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -906,6 +906,9 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall) m_context << success; break; } + case FunctionType::Kind::GasLeft: + m_context << Instruction::GAS; + break; default: solAssert(false, "Invalid function type."); } @@ -921,6 +924,8 @@ bool ExpressionCompiler::visit(NewExpression const&) bool ExpressionCompiler::visit(MemberAccess const& _memberAccess) { + const bool v050 = m_context.experimentalFeatureActive(ExperimentalFeature::V050); + CompilerContext::LocationSetter locationSetter(m_context, _memberAccess); // Check whether the member is a bound function. ASTString const& member = _memberAccess.memberName(); @@ -1135,7 +1140,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess) m_context << Instruction::CALLVALUE; else if (member == "origin") m_context << Instruction::ORIGIN; - else if (member == "gas") + else if (!v050 && member == "gas") m_context << Instruction::GAS; else if (member == "gasprice") m_context << Instruction::GASPRICE; |