commit ef1a3209ab59008d402045a17379fb1f13a21e7b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 12 21:58:25 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 12 21:58:25 2016 +0000
tree dda30ad30ff5f9cb898a3d46e67a6386783080d6
parent ba1642dec60c053895c259deac429463669ddc9b
parent 267508381a1d44930b4bd1018b231ba42a827a5f

Merge "ART: Remove zygote OTA code"

compiler/optimizing/codegen_test.cc

diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index fe9a7af..18db507 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -247,7 +247,7 @@
   } 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(