Forking the type system between Crankshaft & Turbofan.

src/field-type.cc

 // Copyright 2016 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 "src/field-type.h"
 
+#include "src/ast/ast-types.h"
 #include "src/handles-inl.h"
 #include "src/ostreams.h"
-#include "src/types.h"
 
 namespace v8 {
 namespace internal {
 
 // static
 FieldType* FieldType::None() {
   // Do not Smi::FromInt(0) here or for Any(), as that may translate
   // as `nullptr` which is not a valid value for `this`.
   return reinterpret_cast<FieldType*>(Smi::FromInt(2));
 }
@@ skipping 44 matching lines @@
   if (IsNone()) return true;
   if (other->IsNone()) return false;
   if (IsAny()) return false;
   DCHECK(IsClass());
   DCHECK(other->IsClass());
   return this == other;
 }
 
 bool FieldType::NowIs(Handle<FieldType> other) { return NowIs(*other); }
 
-Type* FieldType::Convert(Zone* zone) {
-  if (IsAny()) return Type::NonInternal();
-  if (IsNone()) return Type::None();
+AstType* FieldType::Convert(Zone* zone) {
+  if (IsAny()) return AstType::NonInternal();
+  if (IsNone()) return AstType::None();
   DCHECK(IsClass());
-  return Type::Class(AsClass(), zone);
+  return AstType::Class(AsClass(), zone);
 }
 
 void FieldType::PrintTo(std::ostream& os) {
   if (IsAny()) {
     os << "Any";
   } else if (IsNone()) {
     os << "None";
   } else {
     DCHECK(IsClass());
     os << "Class(" << static_cast<void*>(*AsClass()) << ")";
   }
 }
 
 }  // namespace internal
 }  // namespace v8