[cleanup] Replace ToBooleanICStub::Types with ToBooleanHints

src/compiler/type-hint-analyzer.cc

 // Copyright 2015 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/compiler/type-hint-analyzer.h"
 
 #include "src/assembler.h"
 #include "src/code-stubs.h"
 #include "src/ic/ic-state.h"
 #include "src/type-hints.h"
@@ skipping 74 matching lines @@
   return true;
 }
 
 bool TypeHintAnalysis::GetToBooleanHints(TypeFeedbackId id,
                                          ToBooleanHints* hints) const {
   auto i = infos_.find(id);
   if (i == infos_.end()) return false;
   Handle<Code> code = i->second;
   DCHECK_EQ(Code::TO_BOOLEAN_IC, code->kind());
   ToBooleanICStub stub(code->GetIsolate(), code->extra_ic_state());
-// TODO(bmeurer): Replace ToBooleanICStub::Types with ToBooleanHints.
-#define ASSERT_COMPATIBLE(NAME, Name)         \
-  STATIC_ASSERT(1 << ToBooleanICStub::NAME == \
-                static_cast<int>(ToBooleanHint::k##Name))
-  ASSERT_COMPATIBLE(UNDEFINED, Undefined);
-  ASSERT_COMPATIBLE(BOOLEAN, Boolean);
-  ASSERT_COMPATIBLE(NULL_TYPE, Null);
-  ASSERT_COMPATIBLE(SMI, SmallInteger);
-  ASSERT_COMPATIBLE(SPEC_OBJECT, Receiver);
-  ASSERT_COMPATIBLE(STRING, String);
-  ASSERT_COMPATIBLE(SYMBOL, Symbol);
-  ASSERT_COMPATIBLE(HEAP_NUMBER, HeapNumber);
-  ASSERT_COMPATIBLE(SIMD_VALUE, SimdValue);
-#undef ASSERT_COMPATIBLE
-  *hints = ToBooleanHints(stub.types().ToIntegral());
+  *hints = stub.hints();
   return true;
 }
 
 TypeHintAnalysis* TypeHintAnalyzer::Analyze(Handle<Code> code) {
   DisallowHeapAllocation no_gc;
   TypeHintAnalysis::Infos infos(zone());
   Isolate* const isolate = code->GetIsolate();
   int const mask = RelocInfo::ModeMask(RelocInfo::CODE_TARGET_WITH_ID);
   for (RelocIterator it(*code, mask); !it.done(); it.next()) {
     RelocInfo* rinfo = it.rinfo();
@@ skipping 13 matching lines @@
         break;
     }
   }
   return new (zone()) TypeHintAnalysis(infos, zone());
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8