summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matthew Gharrity <gharrma@google.com> 2016-08-11 17:20:05 -0700
committer Matthew Gharrity <gharrma@google.com> 2016-08-11 17:32:19 -0700
commit1aa559d49b55b72de2da77734dc69704733af269 (patch)
treef7093a05da05ed4455e64ef2c87b543e4280fb6b
parent9d32586b52893a82c5094821d32c4f2d4d201795 (diff)
Use TestCodeGeneratorX86 in codegen unit tests
The codegen unit tests are supposed to use special "test" code generators when targeting ARM and x86 (due to differing calling conventions between the C++ source code and the generated code), yet TestCodeGeneratorX86 was not being used. This fixes that. (The tests were only succeeding because the register allocator happened to not assign the EBX register.) Test: m test-art-host-gtest-codegen_test Change-Id: Ia3dd6998c38e9ff27b8c2734457f86b3fed44ab4
-rw-r--r--compiler/optimizing/codegen_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index fe9a7af250..18db507c48 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -247,7 +247,7 @@ static void RunCode(InstructionSet target_isa,
} else if (target_isa == kX86) {
std::unique_ptr<const X86InstructionSetFeatures> features_x86(
X86InstructionSetFeatures::FromCppDefines());
- x86::CodeGeneratorX86 codegenX86(graph, *features_x86.get(), compiler_options);
+ TestCodeGeneratorX86 codegenX86(graph, *features_x86.get(), compiler_options);
RunCode(&codegenX86, graph, hook_before_codegen, has_result, expected);
} else if (target_isa == kX86_64) {
std::unique_ptr<const X86_64InstructionSetFeatures> features_x86_64(