Forking the type system between Crankshaft & Turbofan.

src/type-info.h

Index: src/type-info.h
diff --git a/src/type-info.h b/src/type-info.h
index 4e8dc54d023abe6d9e1ae639c7d222703f85136b..c87a5e7305594cb169413851acfe8c6cd9c831b8 100644
--- a/src/type-info.h
+++ b/src/type-info.h
@@ -6,10 +6,10 @@
 #define V8_TYPE_INFO_H_
 
 #include "src/allocation.h"
+#include "src/ast/ast-types.h"
 #include "src/contexts.h"
 #include "src/globals.h"
 #include "src/parsing/token.h"
-#include "src/types.h"
 #include "src/zone.h"
 
 namespace v8 {
@@ -77,20 +77,15 @@ class TypeFeedbackOracle: public ZoneObject {
   uint16_t ToBooleanTypes(TypeFeedbackId id);
 
   // Get type information for arithmetic operations and compares.
-  void BinaryType(TypeFeedbackId id,
-                  Type** left,
-                  Type** right,
-                  Type** result,
-                  Maybe<int>* fixed_right_arg,
+  void BinaryType(TypeFeedbackId id, AstType** left, AstType** right,
+                  AstType** result, Maybe<int>* fixed_right_arg,
                   Handle<AllocationSite>* allocation_site,
                   Token::Value operation);
 
-  void CompareType(TypeFeedbackId id,
-                   Type** left,
-                   Type** right,
-                   Type** combined);
+  void CompareType(TypeFeedbackId id, AstType** left, AstType** right,
+                   AstType** combined);
 
-  Type* CountType(TypeFeedbackId id);
+  AstType* CountType(TypeFeedbackId id);
 
   Zone* zone() const { return zone_; }
   Isolate* isolate() const { return isolate_; }