build fix after r25071
authordcarney@chromium.org <dcarney@chromium.org>
Mon, 3 Nov 2014 13:41:56 +0000 (13:41 +0000)
committerdcarney@chromium.org <dcarney@chromium.org>
Mon, 3 Nov 2014 13:42:13 +0000 (13:42 +0000)
TBR=bmeurer@chromium.org

BUG=

Review URL: https://codereview.chromium.org/684523003

Cr-Commit-Position: refs/heads/master@{#25072}
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@25072 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

test/cctest/compiler/test-codegen-deopt.cc
test/cctest/compiler/test-instruction.cc

index ac1d0ef..548441b 100644 (file)
@@ -31,6 +31,7 @@ using namespace v8::internal::compiler;
 #if V8_TURBOFAN_TARGET
 
 typedef RawMachineAssembler::Label MLabel;
+typedef v8::internal::compiler::InstructionSequence TestInstrSeq;
 
 static Handle<JSFunction> NewFunction(const char* source) {
   return v8::Utils::OpenHandle(
@@ -66,10 +67,9 @@ class DeoptCodegenTester {
     // Initialize the codegen and generate code.
     Linkage* linkage = new (scope_->main_zone()) Linkage(info.zone(), &info);
     InstructionBlocks* instruction_blocks =
-        InstructionSequence::InstructionBlocksFor(scope_->main_zone(),
-                                                  schedule);
-    code = new v8::internal::compiler::InstructionSequence(scope_->main_zone(),
-                                                           instruction_blocks);
+        TestInstrSeq::InstructionBlocksFor(scope_->main_zone(), schedule);
+    code = new TestInstrSeq::InstructionSequence(scope_->main_zone(),
+                                                 instruction_blocks);
     SourcePositionTable source_positions(graph);
     InstructionSelector selector(scope_->main_zone(), graph, linkage, code,
                                  schedule, &source_positions);
@@ -107,7 +107,7 @@ class DeoptCodegenTester {
   CompilationInfo info;
   BailoutId bailout_id;
   Handle<Code> result_code;
-  v8::internal::compiler::InstructionSequence* code;
+  TestInstrSeq* code;
   Graph* graph;
 };
 
index 2069c7f..54babfe 100644 (file)
@@ -56,7 +56,7 @@ class InstructionTester : public HandleAndZoneScope {
       DCHECK(schedule.rpo_order()->size() > 0);
     }
     InstructionBlocks* instruction_blocks =
-        InstructionSequence::InstructionBlocksFor(main_zone(), &schedule);
+        TestInstrSeq::InstructionBlocksFor(main_zone(), &schedule);
     code = new TestInstrSeq(main_zone(), instruction_blocks);
   }