From 4713dd625df08fe6a5fe9cd29febcc225951c36d Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 23 Jan 2017 15:46:03 +0100 Subject: Fix error tag usage in lll. --- libevmasm/Assembly.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index 845abfd4..0247593b 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -40,7 +40,7 @@ void Assembly::append(Assembly const& _a) auto newDeposit = m_deposit + _a.deposit(); for (AssemblyItem i: _a.m_items) { - if (i.type() == Tag || i.type() == PushTag) + if (i.type() == Tag || (i.type() == PushTag && i != errorTag())) i.setData(i.data() + m_usedTags); else if (i.type() == PushSub || i.type() == PushSubSize) i.setData(i.data() + m_subs.size()); -- cgit v1.2.3 From 0cb95ac35e4ae2ce1b9f929c00a2aed282bd4a70 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 12 Jan 2017 14:52:01 +0000 Subject: LLL: add test for (panic) in a sequence --- test/liblll/EndToEndTest.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/liblll/EndToEndTest.cpp b/test/liblll/EndToEndTest.cpp index 77c1f740..c7c1fd3b 100644 --- a/test/liblll/EndToEndTest.cpp +++ b/test/liblll/EndToEndTest.cpp @@ -50,6 +50,13 @@ BOOST_AUTO_TEST_CASE(bare_panic) BOOST_REQUIRE(m_output.empty()); } +BOOST_AUTO_TEST_CASE(panic) +{ + char const* sourceCode = "{ (panic) }"; + compileAndRunWithoutCheck(sourceCode); + BOOST_REQUIRE(m_output.empty()); +} + BOOST_AUTO_TEST_CASE(exp_operator_const) { char const* sourceCode = R"( -- cgit v1.2.3