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
parent e1cfb29d
...@@ -19,7 +19,8 @@ namespace internal { ...@@ -19,7 +19,8 @@ namespace internal {
namespace compiler { namespace compiler {
Graph::Graph(Zone* zone) 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) { Node* Graph::NewNode(Operator* op, int input_count, Node** inputs) {
......
...@@ -98,8 +98,9 @@ class RawMachineAssemblerTester ...@@ -98,8 +98,9 @@ class RawMachineAssemblerTester
MachineRepresentation p2 = kMachineLast, MachineRepresentation p2 = kMachineLast,
MachineRepresentation p3 = kMachineLast, MachineRepresentation p3 = kMachineLast,
MachineRepresentation p4 = kMachineLast) MachineRepresentation p4 = kMachineLast)
: MachineAssemblerTester(ReturnValueTraits<ReturnType>::Representation(), : MachineAssemblerTester<RawMachineAssembler>(
p0, p1, p2, p3, p4) {} ReturnValueTraits<ReturnType>::Representation(), p0, p1, p2, p3,
p4) {}
}; };
...@@ -114,8 +115,9 @@ class StructuredMachineAssemblerTester ...@@ -114,8 +115,9 @@ class StructuredMachineAssemblerTester
MachineRepresentation p2 = kMachineLast, MachineRepresentation p2 = kMachineLast,
MachineRepresentation p3 = kMachineLast, MachineRepresentation p3 = kMachineLast,
MachineRepresentation p4 = kMachineLast) MachineRepresentation p4 = kMachineLast)
: MachineAssemblerTester(ReturnValueTraits<ReturnType>::Representation(), : MachineAssemblerTester<StructuredMachineAssembler>(
p0, p1, p2, p3, p4) {} ReturnValueTraits<ReturnType>::Representation(), p0, p1, p2, p3,
p4) {}
}; };
......
...@@ -267,8 +267,9 @@ class IfBuilderModel { ...@@ -267,8 +267,9 @@ class IfBuilderModel {
class IfBuilderGenerator : public StructuredMachineAssemblerTester<int32_t> { class IfBuilderGenerator : public StructuredMachineAssemblerTester<int32_t> {
public: public:
IfBuilderGenerator() IfBuilderGenerator()
: StructuredMachineAssemblerTester(MachineOperatorBuilder::pointer_rep(), : StructuredMachineAssemblerTester<int32_t>(
MachineOperatorBuilder::pointer_rep()), MachineOperatorBuilder::pointer_rep(),
MachineOperatorBuilder::pointer_rep()),
var_(NewVariable(Int32Constant(kInitalVar))), var_(NewVariable(Int32Constant(kInitalVar))),
c_(this), c_(this),
m_(this->zone()), m_(this->zone()),
......
...@@ -878,7 +878,7 @@ TEST(RunSimpleExpressionVariable1) { ...@@ -878,7 +878,7 @@ TEST(RunSimpleExpressionVariable1) {
class QuicksortHelper : public StructuredMachineAssemblerTester<int32_t> { class QuicksortHelper : public StructuredMachineAssemblerTester<int32_t> {
public: public:
QuicksortHelper() QuicksortHelper()
: StructuredMachineAssemblerTester( : StructuredMachineAssemblerTester<int32_t>(
MachineOperatorBuilder::pointer_rep(), kMachineWord32, MachineOperatorBuilder::pointer_rep(), kMachineWord32,
MachineOperatorBuilder::pointer_rep(), kMachineWord32), MachineOperatorBuilder::pointer_rep(), kMachineWord32),
input_(NULL), input_(NULL),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment