From 18bd8cadc48a2799b021e8df0dc4a4ebb34e2577 Mon Sep 17 00:00:00 2001
From: "mstarzinger@chromium.org"
 <mstarzinger@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 30 Jul 2014 15:34:09 +0000
Subject: [PATCH] Fix build failures with LLVM-GCC 4.2 on Mac (moar).

R=titzer@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22720 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/compiler/graph.cc                                     |  3 ++-
 test/cctest/compiler/codegen-tester.h                     | 10 ++++++----
 test/cctest/compiler/test-structured-ifbuilder-fuzzer.cc  |  5 +++--
 test/cctest/compiler/test-structured-machine-assembler.cc |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/compiler/graph.cc b/src/compiler/graph.cc
index 4e69f0f..81824f5 100644
--- a/src/compiler/graph.cc
+++ b/src/compiler/graph.cc
@@ -19,7 +19,8 @@ namespace internal {
 namespace compiler {
 
 Graph::Graph(Zone* zone)
-    : GenericGraph(zone), decorators_(DecoratorVector::allocator_type(zone)) {}
+    : GenericGraph<Node>(zone),
+      decorators_(DecoratorVector::allocator_type(zone)) {}
 
 
 Node* Graph::NewNode(Operator* op, int input_count, Node** inputs) {
diff --git a/test/cctest/compiler/codegen-tester.h b/test/cctest/compiler/codegen-tester.h
index 2cb9a4e..42c8fcd 100644
--- a/test/cctest/compiler/codegen-tester.h
+++ b/test/cctest/compiler/codegen-tester.h
@@ -98,8 +98,9 @@ class RawMachineAssemblerTester
                             MachineRepresentation p2 = kMachineLast,
                             MachineRepresentation p3 = kMachineLast,
                             MachineRepresentation p4 = kMachineLast)
-      : MachineAssemblerTester(ReturnValueTraits<ReturnType>::Representation(),
-                               p0, p1, p2, p3, p4) {}
+      : MachineAssemblerTester<RawMachineAssembler>(
+            ReturnValueTraits<ReturnType>::Representation(), p0, p1, p2, p3,
+            p4) {}
 };
 
 
@@ -114,8 +115,9 @@ class StructuredMachineAssemblerTester
                                    MachineRepresentation p2 = kMachineLast,
                                    MachineRepresentation p3 = kMachineLast,
                                    MachineRepresentation p4 = kMachineLast)
-      : MachineAssemblerTester(ReturnValueTraits<ReturnType>::Representation(),
-                               p0, p1, p2, p3, p4) {}
+      : MachineAssemblerTester<StructuredMachineAssembler>(
+            ReturnValueTraits<ReturnType>::Representation(), p0, p1, p2, p3,
+            p4) {}
 };
 
 
diff --git a/test/cctest/compiler/test-structured-ifbuilder-fuzzer.cc b/test/cctest/compiler/test-structured-ifbuilder-fuzzer.cc
index 156ab8d..a59e0d3 100644
--- a/test/cctest/compiler/test-structured-ifbuilder-fuzzer.cc
+++ b/test/cctest/compiler/test-structured-ifbuilder-fuzzer.cc
@@ -267,8 +267,9 @@ class IfBuilderModel {
 class IfBuilderGenerator : public StructuredMachineAssemblerTester<int32_t> {
  public:
   IfBuilderGenerator()
-      : StructuredMachineAssemblerTester(MachineOperatorBuilder::pointer_rep(),
-                                         MachineOperatorBuilder::pointer_rep()),
+      : StructuredMachineAssemblerTester<int32_t>(
+            MachineOperatorBuilder::pointer_rep(),
+            MachineOperatorBuilder::pointer_rep()),
         var_(NewVariable(Int32Constant(kInitalVar))),
         c_(this),
         m_(this->zone()),
diff --git a/test/cctest/compiler/test-structured-machine-assembler.cc b/test/cctest/compiler/test-structured-machine-assembler.cc
index ab06348..6d8020b 100644
--- a/test/cctest/compiler/test-structured-machine-assembler.cc
+++ b/test/cctest/compiler/test-structured-machine-assembler.cc
@@ -878,7 +878,7 @@ TEST(RunSimpleExpressionVariable1) {
 class QuicksortHelper : public StructuredMachineAssemblerTester<int32_t> {
  public:
   QuicksortHelper()
-      : StructuredMachineAssemblerTester(
+      : StructuredMachineAssemblerTester<int32_t>(
             MachineOperatorBuilder::pointer_rep(), kMachineWord32,
             MachineOperatorBuilder::pointer_rep(), kMachineWord32),
         input_(NULL),
-- 
2.7.4