Forking the type system between Crankshaft & Turbofan.

src/crankshaft/typing.h

Index: src/crankshaft/typing.h
diff --git a/src/crankshaft/typing.h b/src/crankshaft/typing.h
index 94340c5a74510736f691b8a5be2c02828cc5a42e..ff112f0d36ed0575ac1dd7eee86b5883abf8f6e1 100644
--- a/src/crankshaft/typing.h
+++ b/src/crankshaft/typing.h
@@ -7,11 +7,11 @@
 
 #include "src/allocation.h"
 #include "src/ast/ast-type-bounds.h"
+#include "src/ast/ast-types.h"
 #include "src/ast/scopes.h"
 #include "src/ast/variables.h"
 #include "src/effects.h"
 #include "src/type-info.h"
-#include "src/types.h"
 #include "src/zone.h"
 
 namespace v8 {
@@ -49,11 +49,11 @@ class AstTyper final : public AstVisitor<AstTyper> {
   Zone* zone() const { return zone_; }
   TypeFeedbackOracle* oracle() { return &oracle_; }
 
-  void NarrowType(Expression* e, Bounds b) {
-    bounds_->set(e, Bounds::Both(bounds_->get(e), b, zone()));
+  void NarrowType(Expression* e, AstBounds b) {
+    bounds_->set(e, AstBounds::Both(bounds_->get(e), b, zone()));
   }
-  void NarrowLowerType(Expression* e, Type* t) {
-    bounds_->set(e, Bounds::NarrowLower(bounds_->get(e), t, zone()));
+  void NarrowLowerType(Expression* e, AstType* t) {
+    bounds_->set(e, AstBounds::NarrowLower(bounds_->get(e), t, zone()));
   }
 
   Effects EnterEffects() {