summaryrefslogtreecommitdiff
path: root/compiler/optimizing/builder.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2017-09-26 09:15:35 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-09-26 09:15:35 +0000
commit4894cdd8ebd4624f0f09c1545c1bbf7ff0bb5bc3 (patch)
treed2e2cc57dd046e2bd06cb3cc67e2e9f6950dac87 /compiler/optimizing/builder.h
parentd796c61d303424798c8cd35fabb77760255ea2aa (diff)
parent0ebe0d83138bba1996e9c8007969b5381d972b32 (diff)
Merge "ART: Introduce compiler data type."
Diffstat (limited to 'compiler/optimizing/builder.h')
-rw-r--r--compiler/optimizing/builder.h32
1 files changed, 2 insertions, 30 deletions
diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h
index 2c9a9efadf..9524fe2534 100644
--- a/compiler/optimizing/builder.h
+++ b/compiler/optimizing/builder.h
@@ -27,7 +27,6 @@
#include "instruction_builder.h"
#include "nodes.h"
#include "optimizing_compiler_stats.h"
-#include "primitive.h"
#include "ssa_builder.h"
namespace art {
@@ -39,45 +38,18 @@ class HGraphBuilder : public ValueObject {
HGraphBuilder(HGraph* graph,
DexCompilationUnit* dex_compilation_unit,
const DexCompilationUnit* const outer_compilation_unit,
- const DexFile* dex_file,
- const DexFile::CodeItem& code_item,
CompilerDriver* driver,
CodeGenerator* code_generator,
OptimizingCompilerStats* compiler_stats,
const uint8_t* interpreter_metadata,
Handle<mirror::DexCache> dex_cache,
- VariableSizedHandleScope* handles)
- : graph_(graph),
- dex_file_(dex_file),
- code_item_(code_item),
- dex_compilation_unit_(dex_compilation_unit),
- compiler_driver_(driver),
- compilation_stats_(compiler_stats),
- block_builder_(graph, dex_file, code_item),
- ssa_builder_(graph,
- dex_compilation_unit->GetClassLoader(),
- dex_compilation_unit->GetDexCache(),
- handles),
- instruction_builder_(graph,
- &block_builder_,
- &ssa_builder_,
- dex_file,
- code_item_,
- Primitive::GetType(dex_compilation_unit_->GetShorty()[0]),
- dex_compilation_unit,
- outer_compilation_unit,
- driver,
- code_generator,
- interpreter_metadata,
- compiler_stats,
- dex_cache,
- handles) {}
+ VariableSizedHandleScope* handles);
// Only for unit testing.
HGraphBuilder(HGraph* graph,
const DexFile::CodeItem& code_item,
VariableSizedHandleScope* handles,
- Primitive::Type return_type = Primitive::kPrimInt)
+ DataType::Type return_type = DataType::Type::kInt32)
: graph_(graph),
dex_file_(nullptr),
code_item_(code_item),