From 0ebe0d83138bba1996e9c8007969b5381d972b32 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 21 Sep 2017 22:50:39 +0100 Subject: 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 --- compiler/optimizing/constant_folding_test.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/optimizing/constant_folding_test.cc') diff --git a/compiler/optimizing/constant_folding_test.cc b/compiler/optimizing/constant_folding_test.cc index 7ef28ed910..c85a2e3e70 100644 --- a/compiler/optimizing/constant_folding_test.cc +++ b/compiler/optimizing/constant_folding_test.cc @@ -43,7 +43,7 @@ class ConstantFoldingTest : public CommonCompilerTest { const std::string& expected_after_cf, const std::string& expected_after_dce, const std::function& 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 @@ TEST_F(ConstantFoldingTest, LongConstantFoldingNegation) { expected_after_cf, expected_after_dce, check_after_cf, - Primitive::kPrimLong); + DataType::Type::kInt64); } /** @@ -483,7 +483,7 @@ TEST_F(ConstantFoldingTest, LongConstantFoldingOnAddition) { expected_after_cf, expected_after_dce, check_after_cf, - Primitive::kPrimLong); + DataType::Type::kInt64); } /** @@ -547,7 +547,7 @@ TEST_F(ConstantFoldingTest, LongConstantFoldingOnSubtraction) { expected_after_cf, expected_after_dce, check_after_cf, - Primitive::kPrimLong); + DataType::Type::kInt64); } /** @@ -756,7 +756,7 @@ TEST_F(ConstantFoldingTest, UnsignedComparisonsWithZero) { // 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()); -- cgit v1.2.3-59-g8ed1b