Better typing and type verification

test/cctest/compiler/test-changes-lowering.cc

 // 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.
 
 #include <limits>
 
 #include "src/compiler/control-builders.h"
 #include "src/compiler/generic-node-inl.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/pipeline.h"
 #include "src/compiler/simplified-lowering.h"
 #include "src/compiler/simplified-node-factory.h"
-#include "src/compiler/typer.h"
 #include "src/compiler/verifier.h"
 #include "src/execution.h"
 #include "src/parser.h"
 #include "src/rewriter.h"
 #include "src/scopes.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/graph-builder-tester.h"
 #include "test/cctest/compiler/value-helper.h"
 
 using namespace v8::internal;
 using namespace v8::internal::compiler;
 
 template <typename ReturnType>
 class ChangesLoweringTester : public GraphBuilderTester<ReturnType> {
  public:
   explicit ChangesLoweringTester(MachineType p0 = kMachNone)
       : GraphBuilderTester<ReturnType>(p0),
-        typer(this->zone()),
-        jsgraph(this->graph(), this->common(), &typer),
+        jsgraph(this->graph(), this->common()),
         lowering(&jsgraph),
         function(Handle<JSFunction>::null()) {}
 
-  Typer typer;
   JSGraph jsgraph;
   SimplifiedLowering lowering;
   Handle<JSFunction> function;
 
   Node* start() { return this->graph()->start(); }
 
   template <typename T>
   T* CallWithPotentialGC() {
     // TODO(titzer): we need to wrap the code in a JSFunction and call it via
     // Execution::Call() so that the GC knows about the frame, can walk it,
@@ skipping 55 matching lines @@
   void BuildAndLower(Operator* op) {
     // We build a graph by hand here, because the raw machine assembler
     // does not add the correct control and effect nodes.
     Node* p0 = this->Parameter(0);
     Node* change = this->graph()->NewNode(op, p0);
     Node* ret = this->graph()->NewNode(this->common()->Return(), change,
                                        this->start(), this->start());
     Node* end = this->graph()->NewNode(this->common()->End(), ret);
     this->graph()->SetEnd(end);
     this->lowering.LowerChange(change, this->start(), this->start());
-    Verifier::Run(this->graph());
+    Verifier::Run(this->graph(), Verifier::UNTYPED);
   }
 
   void BuildStoreAndLower(Operator* op, Operator* store_op, void* location) {
     // We build a graph by hand here, because the raw machine assembler
     // does not add the correct control and effect nodes.
     Node* p0 = this->Parameter(0);
     Node* change = this->graph()->NewNode(op, p0);
     Node* store = this->graph()->NewNode(
         store_op, this->PointerConstant(location), this->Int32Constant(0),
         change, this->start(), this->start());
     Node* ret = this->graph()->NewNode(
         this->common()->Return(), this->Int32Constant(0), store, this->start());
     Node* end = this->graph()->NewNode(this->common()->End(), ret);
     this->graph()->SetEnd(end);
     this->lowering.LowerChange(change, this->start(), this->start());
-    Verifier::Run(this->graph());
+    Verifier::Run(this->graph(), Verifier::UNTYPED);
   }
 
   void BuildLoadAndLower(Operator* op, Operator* load_op, void* location) {
     // We build a graph by hand here, because the raw machine assembler
     // does not add the correct control and effect nodes.
     Node* load =
         this->graph()->NewNode(load_op, this->PointerConstant(location),
                                this->Int32Constant(0), this->start());
     Node* change = this->graph()->NewNode(op, load);
     Node* ret = this->graph()->NewNode(this->common()->Return(), change,
                                        this->start(), this->start());
     Node* end = this->graph()->NewNode(this->common()->End(), ret);
     this->graph()->SetEnd(end);
     this->lowering.LowerChange(change, this->start(), this->start());
-    Verifier::Run(this->graph());
+    Verifier::Run(this->graph(), Verifier::UNTYPED);
   }
 
   Factory* factory() { return this->isolate()->factory(); }
   Heap* heap() { return this->isolate()->heap(); }
 };
 
 
 TEST(RunChangeTaggedToInt32) {
   // Build and lower a graph by hand.
   ChangesLoweringTester<int32_t> t(kMachAnyTagged);
@@ skipping 234 matching lines @@
 
   if (TODO_FLOAT64_TO_TAGGED && Pipeline::SupportedTarget()) {
     FOR_FLOAT64_INPUTS(i) {
       input = *i;
       SimulateFullSpace(CcTest::heap()->new_space());
       Object* result = t.CallWithPotentialGC<Object>();
       t.CheckNumber(input, result);
     }
   }
 }