diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-06-29 01:16:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-29 01:16:52 +0800 |
| commit | dad6a9ad08082481ec67aa6adc2f38e62a779165 (patch) | |
| tree | 5871cb1bc725c1118dce04ffcc6554bd083c5a7c /libsolidity | |
| parent | 96fb3b4945557aaada84a1c802d24ff153e1fef7 (diff) | |
| parent | 6a708b0cfe245499f85f7260f7267b399c9a7fcb (diff) | |
| download | dexon-solidity-dad6a9ad08082481ec67aa6adc2f38e62a779165.tar.gz dexon-solidity-dad6a9ad08082481ec67aa6adc2f38e62a779165.tar.zst dexon-solidity-dad6a9ad08082481ec67aa6adc2f38e62a779165.zip | |
Merge pull request #2457 from ethereum/fixNegativeStackHeight
Fix negative stack height
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 18 | ||||
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index 977a2c7c..74b07d4d 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -267,13 +267,19 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac m_context << notFound; if (fallback) { + m_context.setStackOffset(0); if (!fallback->isPayable()) appendCallValueCheck(); + // Return tag is used to jump out of the function. eth::AssemblyItem returnTag = m_context.pushNewTag(); fallback->accept(*this); m_context << returnTag; - appendReturnValuePacker(FunctionType(*fallback).returnParameterTypes(), _contract.isLibrary()); + solAssert(FunctionType(*fallback).parameterTypes().empty(), ""); + solAssert(FunctionType(*fallback).returnParameterTypes().empty(), ""); + // Return tag gets consumed. + m_context.adjustStackOffset(-1); + m_context << Instruction::STOP; } else m_context.appendRevert(); @@ -285,16 +291,26 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac CompilerContext::LocationSetter locationSetter(m_context, functionType->declaration()); m_context << callDataUnpackerEntryPoints.at(it.first); + m_context.setStackOffset(0); // We have to allow this for libraries, because value of the previous // call is still visible in the delegatecall. if (!functionType->isPayable() && !_contract.isLibrary()) appendCallValueCheck(); + // Return tag is used to jump out of the function. eth::AssemblyItem returnTag = m_context.pushNewTag(); + // Parameter for calldataUnpacker m_context << CompilerUtils::dataStartOffset; appendCalldataUnpacker(functionType->parameterTypes()); m_context.appendJumpTo(m_context.functionEntryLabel(functionType->declaration())); m_context << returnTag; + // Return tag and input parameters get consumed. + m_context.adjustStackOffset( + CompilerUtils(m_context).sizeOnStack(functionType->returnParameterTypes()) - + CompilerUtils(m_context).sizeOnStack(functionType->parameterTypes()) - + 1 + ); + // Consumes the return parameters. appendReturnValuePacker(functionType->returnParameterTypes(), _contract.isLibrary()); } } diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index a65549fd..9d4024c9 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -88,6 +88,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const& FunctionType accessorType(_varDecl); TypePointers paramTypes = accessorType.parameterTypes(); + m_context.adjustStackOffset(1 + CompilerUtils::sizeOnStack(paramTypes)); // retrieve the position of the variable auto const& location = m_context.storageLocationOfVariable(_varDecl); |