cerc-io/solidity
16
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 pull request #2360 from ethereum/codegen-cleanup

Browse Source 
Remove seldom used CodeGen case
This commit is contained in:
chriseth 2017-06-09 15:40:03 +02:00 committed by GitHub
commit 32dc538369
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsolidity/inlineasm/AsmCodeGen.cpp
View File

@ -132,17 +132,6 @@ private:
eth::Assembly& m_assembly; eth::Assembly& m_assembly;
}; };
eth::Assembly assembly::CodeGenerator::assemble(
Block const& _parsedData,
AsmAnalysisInfo& _analysisInfo,
julia::ExternalIdentifierAccess const& _identifierAccess
)
{
eth::Assembly assembly;
EthAssemblyAdapter assemblyAdapter(assembly);
julia::CodeTransform(assemblyAdapter, _analysisInfo, false, _identifierAccess).run(_parsedData);
return assembly;
}
void assembly::CodeGenerator::assemble( void assembly::CodeGenerator::assemble(
Block const& _parsedData, Block const& _parsedData,

6
libsolidity/inlineasm/AsmCodeGen.h
View File

@ -41,12 +41,6 @@ struct Block;
class CodeGenerator class CodeGenerator
{ {
public: public:
/// Performs code generation and @returns the result.
static eth::Assembly assemble(
Block const& _parsedData,
AsmAnalysisInfo& _analysisInfo,
julia::ExternalIdentifierAccess const& _identifierAccess = julia::ExternalIdentifierAccess()
);
/// Performs code generation and appends generated to to _assembly. /// Performs code generation and appends generated to to _assembly.
static void assemble( static void assemble(
Block const& _parsedData, Block const& _parsedData,

4
libsolidity/interface/AssemblyStack.cpp
View File

@ -26,6 +26,7 @@
#include <libsolidity/inlineasm/AsmPrinter.h> #include <libsolidity/inlineasm/AsmPrinter.h>
#include <libsolidity/inlineasm/AsmParser.h> #include <libsolidity/inlineasm/AsmParser.h>
#include <libsolidity/inlineasm/AsmAnalysis.h> #include <libsolidity/inlineasm/AsmAnalysis.h>
#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
#include <libsolidity/inlineasm/AsmCodeGen.h> #include <libsolidity/inlineasm/AsmCodeGen.h>
#include <libevmasm/Assembly.h> #include <libevmasm/Assembly.h>
@ -86,7 +87,8 @@ eth::LinkerObject AssemblyStack::assemble(Machine _machine) const
{ {
case Machine::EVM: case Machine::EVM:
{ {
auto assembly = assembly::CodeGenerator::assemble(*m_parserResult, *m_analysisInfo); eth::Assembly assembly;
assembly::CodeGenerator::assemble(*m_parserResult, *m_analysisInfo, assembly);
return assembly.assemble(); return assembly.assemble();
} }
case Machine::EVM15: case Machine::EVM15:

1
libsolidity/interface/AssemblyStack.h
View File

@ -21,7 +21,6 @@
#pragma once #pragma once
#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
#include <libsolidity/interface/ErrorReporter.h> #include <libsolidity/interface/ErrorReporter.h>
#include <libevmasm/LinkerObject.h> #include <libevmasm/LinkerObject.h>