Merge pull request #2350 from benjaminion/patch-1

Change LLL opcode generated by "panic" to INVALID
ethereum · Jun 13, 2017 · d3f4c97 · d3f4c97
2 parents d47fcbb + c603369
commit d3f4c97
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp
@@ -573,10 +573,6 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
 				m_asm.append(i.m_asm);
 			m_asm.popTo(1);
 		}
-		else if (us == "PANIC")
-		{
-			m_asm.appendJump(m_asm.errorTag());
-		}
 		else if (us == "BYTECODESIZE")
 		{
 			m_asm.appendProgramSize();

diff --git a/liblll/CompilerState.cpp b/liblll/CompilerState.cpp
@@ -45,6 +45,7 @@ CodeFragment const& CompilerState::getDef(std::string const& _s)
 void CompilerState::populateStandard()
 {
 	static const string s = "{"
+	"(def 'panic () (asm INVALID))"
 	"(def 'allgas (- (gas) 21))"
 	"(def 'send (to value) (call allgas to value 0 0 0 0))"
 	"(def 'send (gaslimit to value) (call gaslimit to value 0 0 0 0))"