ART: Introduce compiler data type.
Replace most uses of the runtime's Primitive in compiler
with a new class DataType. This prepares for introducing
new types, such as Uint8, that the runtime does not need
to know about.
Test: m test-art-host-gtest
Test: testrunner.py --host
Bug: 23964345
Change-Id: Iec2ad82454eec678fffcd8279a9746b90feb9b0c
diff --git a/compiler/optimizing/constant_folding_test.cc b/compiler/optimizing/constant_folding_test.cc
index 7ef28ed..c85a2e3 100644
--- a/compiler/optimizing/constant_folding_test.cc
+++ b/compiler/optimizing/constant_folding_test.cc
@@ -43,7 +43,7 @@
const std::string& expected_after_cf,
const std::string& expected_after_dce,
const std::function<void(HGraph*)>& check_after_cf,
- Primitive::Type return_type = Primitive::kPrimInt) {
+ DataType::Type return_type = DataType::Type::kInt32) {
graph_ = CreateCFG(&allocator_, data, return_type);
TestCodeOnReadyGraph(expected_before,
expected_after_cf,
@@ -208,7 +208,7 @@
expected_after_cf,
expected_after_dce,
check_after_cf,
- Primitive::kPrimLong);
+ DataType::Type::kInt64);
}
/**
@@ -483,7 +483,7 @@
expected_after_cf,
expected_after_dce,
check_after_cf,
- Primitive::kPrimLong);
+ DataType::Type::kInt64);
}
/**
@@ -547,7 +547,7 @@
expected_after_cf,
expected_after_dce,
check_after_cf,
- Primitive::kPrimLong);
+ DataType::Type::kInt64);
}
/**
@@ -756,7 +756,7 @@
// Make various unsigned comparisons with zero against a parameter.
HInstruction* parameter = new (&allocator_) HParameterValue(
- graph_->GetDexFile(), dex::TypeIndex(0), 0, Primitive::kPrimInt, true);
+ graph_->GetDexFile(), dex::TypeIndex(0), 0, DataType::Type::kInt32, true);
entry_block->AddInstruction(parameter);
entry_block->AddInstruction(new (&allocator_) HGoto());