Forking the type system between Crankshaft & Turbofan.

src/crankshaft/hydrogen-types.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_CRANKSHAFT_HYDROGEN_TYPES_H_
 #define V8_CRANKSHAFT_HYDROGEN_TYPES_H_
 
 #include <climits>
 #include <iosfwd>
 
+#include "src/ast/ast-types.h"
 #include "src/base/macros.h"
-#include "src/types.h"
 
 namespace v8 {
 namespace internal {
 
 // Forward declarations.
 template <typename T> class Handle;
 class FieldType;
 class Object;
 
 #define HTYPE_LIST(V)                               \
@@ skipping 34 matching lines @@
     return Combine(other).Equals(other);
   }
 
   #define DECLARE_IS_TYPE(Name, mask)               \
     bool Is##Name() const WARN_UNUSED_RESULT {   \
       return IsSubtypeOf(HType::Name());            \
     }
   HTYPE_LIST(DECLARE_IS_TYPE)
   #undef DECLARE_IS_TYPE
 
-  static HType FromType(Type* type) WARN_UNUSED_RESULT;
+  static HType FromType(AstType* type) WARN_UNUSED_RESULT;
   static HType FromFieldType(Handle<FieldType> type,
                              Zone* temp_zone) WARN_UNUSED_RESULT;
   static HType FromValue(Handle<Object> value) WARN_UNUSED_RESULT;
 
   friend std::ostream& operator<<(std::ostream& os, const HType& t);
 
  private:
   enum Kind {
     #define DECLARE_TYPE(Name, mask) k##Name = mask,
     HTYPE_LIST(DECLARE_TYPE)
     #undef DECLARE_TYPE
     LAST_KIND = kNone
   };
 
   // Make sure type fits in int16.
   STATIC_ASSERT(LAST_KIND < (1 << (CHAR_BIT * sizeof(int16_t))));
 
   explicit HType(Kind kind) : kind_(kind) { }
 
   int16_t kind_;
 };
 
 
 std::ostream& operator<<(std::ostream& os, const HType& t);
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CRANKSHAFT_HYDROGEN_TYPES_H_