[turbofan] Fix includes for JSOperatorBuilder.

R=mvstanton@chromium.org

Review-Url: https://codereview.chromium.org/2063823006
Cr-Commit-Position: refs/heads/master@{#36972}

src/compiler/js-operator.cc

@@ -9,8 +9,8 @@
 #include "src/base/lazy-instance.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
-#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
-#include "src/type-feedback-vector-inl.h"
+#include "src/handles-inl.h"
+#include "src/type-feedback-vector.h"
 
 namespace v8 {
 namespace internal {

src/type-feedback-vector-inl.h

@@ -78,12 +78,6 @@ TypeFeedbackMetadata* TypeFeedbackVector::metadata() const {
 }
 
 
-// static
-int TypeFeedbackVector::GetIndex(FeedbackVectorSlot slot) {
-  return kReservedIndexCount + slot.ToInt();
-}
-
-
 // Conversion from an integer index to either a slot or an ic slot. The caller
 // should know what kind she expects.
 // static

src/type-feedback-vector.h

@@ -201,7 +201,9 @@ class TypeFeedbackVector : public FixedArray {
   inline TypeFeedbackMetadata* metadata() const;
 
   // Conversion from a slot to an integer index to the underlying array.
-  static inline int GetIndex(FeedbackVectorSlot slot);
+  static int GetIndex(FeedbackVectorSlot slot) {
+    return kReservedIndexCount + slot.ToInt();
+  }
   static int GetIndexFromSpec(const FeedbackVectorSpec* spec,
                               FeedbackVectorSlot slot);