diff options
| author | chriseth <chris@ethereum.org> | 2016-11-15 02:46:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 02:46:25 +0800 |
| commit | 07e4cd6e3230d42d974f2b3a1688f74f0b9fe8e2 (patch) | |
| tree | e68a5f8b3869fd5d32e1e6c623f701c385ed4461 /libsolidity/codegen | |
| parent | 54555adb67f098161780cbc266b54eead9fe7b8a (diff) | |
| parent | dbcbfafda8e44f56a7952993fd9f6699822395d6 (diff) | |
| download | dexon-solidity-07e4cd6e3230d42d974f2b3a1688f74f0b9fe8e2.tar.gz dexon-solidity-07e4cd6e3230d42d974f2b3a1688f74f0b9fe8e2.tar.zst dexon-solidity-07e4cd6e3230d42d974f2b3a1688f74f0b9fe8e2.zip | |
Merge pull request #1372 from ethereum/invalid_enum_as_external_ret
Invalid enum as external ret
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index 54645289..db4aac34 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -315,7 +315,7 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp Type::Category stackTypeCategory = _typeOnStack.category(); Type::Category targetTypeCategory = _targetType.category(); - bool enumOverflowCheckPending = (targetTypeCategory == Type::Category::Enum); + bool enumOverflowCheckPending = (targetTypeCategory == Type::Category::Enum || stackTypeCategory == Type::Category::Enum); switch (stackTypeCategory) { @@ -353,7 +353,7 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp solAssert(_targetType == _typeOnStack || targetTypeCategory == Type::Category::Integer, ""); if (enumOverflowCheckPending) { - EnumType const& enumType = dynamic_cast<decltype(enumType)>(_targetType); + EnumType const& enumType = dynamic_cast<decltype(enumType)>(_typeOnStack); solAssert(enumType.numberOfMembers() > 0, "empty enum should have caused a parser error."); m_context << u256(enumType.numberOfMembers() - 1) << Instruction::DUP2 << Instruction::GT; m_context.appendConditionalJumpTo(m_context.errorTag()); |