diff options
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/ast/ASTJsonConverter.cpp | 17 | ||||
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index 49ee6d34..0ea5e093 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -22,6 +22,7 @@ #include <libsolidity/ast/ASTJsonConverter.h> #include <boost/algorithm/string/join.hpp> +#include <libdevcore/UTF8.h> #include <libsolidity/ast/AST.h> using namespace std; @@ -397,9 +398,21 @@ bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node) bool ASTJsonConverter::visit(Literal const& _node) { char const* tokenString = Token::toString(_node.token()); + size_t invalidPos = 0; + Json::Value value{_node.value()}; + if (!dev::validate(_node.value(), invalidPos)) + value = Json::nullValue; + Token::Value subdenomination = Token::Value(_node.subDenomination()); addJsonNode(_node, "Literal", { - make_pair("string", tokenString ? tokenString : Json::Value()), - make_pair("value", _node.value()), + make_pair("token", tokenString ? tokenString : Json::Value()), + make_pair("value", value), + make_pair("hexvalue", toHex(_node.value())), + make_pair( + "subdenomination", + subdenomination == Token::Illegal ? + Json::nullValue : + Json::Value{Token::toString(subdenomination)} + ), make_pair("type", type(_node)) }); return true; diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index de937b42..1cc4a50d 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -1526,11 +1526,13 @@ void ExpressionCompiler::appendExternalFunctionCall( m_context << u256(0); m_context << dupInstruction(m_context.baseToCurrentStackOffset(contractStackPos)); + bool existenceChecked = false; // Check the the target contract exists (has code) for non-low-level calls. if (funKind == FunctionKind::External || funKind == FunctionKind::CallCode || funKind == FunctionKind::DelegateCall) { m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO; m_context.appendConditionalJumpTo(m_context.errorTag()); + existenceChecked = true; } if (_functionType.gasSet()) @@ -1542,7 +1544,7 @@ void ExpressionCompiler::appendExternalFunctionCall( u256 gasNeededByCaller = eth::GasCosts::callGas + 10; if (_functionType.valueSet()) gasNeededByCaller += eth::GasCosts::callValueTransferGas; - if (!isCallCode && !isDelegateCall) + if (!isCallCode && !isDelegateCall && !existenceChecked) gasNeededByCaller += eth::GasCosts::callNewAccountGas; // we never know m_context << gasNeededByCaller << |