cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler

Browse Source 
Conflicts:
	alethzero/CMakeLists.txt
This commit is contained in:
Christian 2014-11-03 16:13:40 +01:00
commit e9f8ebe4dc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assembly.cpp
View File

@ -413,8 +413,8 @@ bytes Assembly::assemble() const
break;
}
case Tag:
ret.push_back((byte)Instruction::JUMPDEST);
tagPos[(unsigned)i.m_data] = ret.size();
ret.push_back((byte)Instruction::JUMPDEST);
break;
default:;
}