Revert of [turbofan] Various fixes to allow unboxed doubles as arguments in registers...

test/cctest/compiler/graph-builder-tester.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_CCTEST_COMPILER_GRAPH_BUILDER_TESTER_H_
 #define V8_CCTEST_COMPILER_GRAPH_BUILDER_TESTER_H_
 
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
@@ skipping 10 matching lines @@
 namespace compiler {
 
 class GraphAndBuilders {
  public:
   explicit GraphAndBuilders(Zone* zone)
       : main_graph_(new (zone) Graph(zone)),
         main_common_(zone),
         main_machine_(zone),
         main_simplified_(zone) {}
 
-  Graph* graph() const { return main_graph_; }
-  Zone* zone() const { return graph()->zone(); }
-  CommonOperatorBuilder* common() { return &main_common_; }
-  MachineOperatorBuilder* machine() { return &main_machine_; }
-  SimplifiedOperatorBuilder* simplified() { return &main_simplified_; }
-
  protected:
   // Prefixed with main_ to avoid naming conflicts.
   Graph* main_graph_;
   CommonOperatorBuilder main_common_;
   MachineOperatorBuilder main_machine_;
   SimplifiedOperatorBuilder main_simplified_;
 };
 
 
 template <typename ReturnType>
 class GraphBuilderTester : public HandleAndZoneScope,
-                           public GraphAndBuilders,
+                           private GraphAndBuilders,
                            public CallHelper<ReturnType> {
  public:
   explicit GraphBuilderTester(MachineType p0 = kMachNone,
                               MachineType p1 = kMachNone,
                               MachineType p2 = kMachNone,
                               MachineType p3 = kMachNone,
                               MachineType p4 = kMachNone)
       : GraphAndBuilders(main_zone()),
         CallHelper<ReturnType>(
             main_isolate(),
             CSignature::New(main_zone(), MachineTypeForC<ReturnType>(), p0, p1,
                             p2, p3, p4)),
         effect_(NULL),
         return_(NULL),
         parameters_(main_zone()->template NewArray<Node*>(parameter_count())) {
     Begin(static_cast<int>(parameter_count()));
     InitParameters();
   }
   virtual ~GraphBuilderTester() {}
 
   void GenerateCode() { Generate(); }
   Node* Parameter(size_t index) {
     DCHECK(index < parameter_count());
     return parameters_[index];
   }
 
   Isolate* isolate() { return main_isolate(); }
+  Graph* graph() const { return main_graph_; }
+  Zone* zone() const { return graph()->zone(); }
   Factory* factory() { return isolate()->factory(); }
+  CommonOperatorBuilder* common() { return &main_common_; }
+  MachineOperatorBuilder* machine() { return &main_machine_; }
+  SimplifiedOperatorBuilder* simplified() { return &main_simplified_; }
 
   // Initialize graph and builder.
   void Begin(int num_parameters) {
     DCHECK(graph()->start() == NULL);
     Node* start = graph()->NewNode(common()->Start(num_parameters + 3));
     graph()->SetStart(start);
     effect_ = start;
   }
 
   void Return(Node* value) {
@@ skipping 211 matching lines @@
   Node* return_;
   Node** parameters_;
   MaybeHandle<Code> code_;
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CCTEST_COMPILER_GRAPH_BUILDER_TESTER_H_