From 4361797ddca240dc55c9f88c6579383eb558b309 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 1 Feb 2017 12:22:14 +0000 Subject: [PATCH] Only capture function type to address conversion --- libsolidity/codegen/CompilerUtils.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index 469bd0edf..9f019d279 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -789,15 +789,17 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp break; case Type::Category::Function: { - solAssert(targetTypeCategory == Type::Category::Integer, "Invalid conversion for function type."); - IntegerType const& targetType = dynamic_cast(_targetType); - solAssert(targetType.isAddress(), "Function type can only be converted to address."); - FunctionType const& typeOnStack = dynamic_cast(_typeOnStack); - solAssert(typeOnStack.location() == FunctionType::Location::External, "Only external function type can be converted."); + if (targetTypeCategory == Type::Category::Integer) + { + IntegerType const& targetType = dynamic_cast(_targetType); + solAssert(targetType.isAddress(), "Function type can only be converted to address."); + FunctionType const& typeOnStack = dynamic_cast(_typeOnStack); + solAssert(typeOnStack.location() == FunctionType::Location::External, "Only external function type can be converted."); - // stack:
- m_context << Instruction::POP; - break; + // stack:
+ m_context << Instruction::POP; + break; + } } default: // All other types should not be convertible to non-equal types.