aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-06-09 21:40:03 +0800
committerGitHub <noreply@github.com>2017-06-09 21:40:03 +0800
commit32dc5383691fd86e67b11d77d1b333f9715491c5 (patch)
tree849125632efb5b9d831802cf4971a15ed8904e6e /libsolidity
parent3e91177c4d3966be32eea6b4b7b3a63058022dc7 (diff)
parent8768080a02d6862849705ee106c81672368721e6 (diff)
downloaddexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.tar
dexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.tar.gz
dexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.tar.bz2
dexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.tar.lz
dexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.tar.xz
dexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.tar.zst
dexon-solidity-32dc5383691fd86e67b11d77d1b333f9715491c5.zip
Merge pull request #2360 from ethereum/codegen-cleanup
Remove seldom used CodeGen case
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/inlineasm/AsmCodeGen.cpp11
-rw-r--r--libsolidity/inlineasm/AsmCodeGen.h6
-rw-r--r--libsolidity/interface/AssemblyStack.cpp4
-rw-r--r--libsolidity/interface/AssemblyStack.h1
4 files changed, 3 insertions, 19 deletions
diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp
index 0e4e744f..27750453 100644
--- a/libsolidity/inlineasm/AsmCodeGen.cpp
+++ b/libsolidity/inlineasm/AsmCodeGen.cpp
@@ -132,17 +132,6 @@ private:
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(
Block const& _parsedData,
diff --git a/libsolidity/inlineasm/AsmCodeGen.h b/libsolidity/inlineasm/AsmCodeGen.h
index 7a149d74..2a36a590 100644
--- a/libsolidity/inlineasm/AsmCodeGen.h
+++ b/libsolidity/inlineasm/AsmCodeGen.h
@@ -41,12 +41,6 @@ struct Block;
class CodeGenerator
{
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.
static void assemble(
Block const& _parsedData,
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index 31d9e494..75877881 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -26,6 +26,7 @@
#include <libsolidity/inlineasm/AsmPrinter.h>
#include <libsolidity/inlineasm/AsmParser.h>
#include <libsolidity/inlineasm/AsmAnalysis.h>
+#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
#include <libsolidity/inlineasm/AsmCodeGen.h>
#include <libevmasm/Assembly.h>
@@ -86,7 +87,8 @@ eth::LinkerObject AssemblyStack::assemble(Machine _machine) const
{
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();
}
case Machine::EVM15:
diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h
index 17d5f055..ee2a334c 100644
--- a/libsolidity/interface/AssemblyStack.h
+++ b/libsolidity/interface/AssemblyStack.h
@@ -21,7 +21,6 @@
#pragma once
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
#include <libsolidity/interface/ErrorReporter.h>
#include <libevmasm/LinkerObject.h>