Move AnnotationIndex implementation to .cpp

Summary: Just a refactor, setting up for next diff.

Reviewed By: yoney

Differential Revision: D114023459

fbshipit-source-id: afa2c02876e44ce0f1fc150599f913ccb1b12eee

Author: alexmalyshev

cinderx/Jit/hir/annotation_index.cpp

@@ -2,8 +2,11 @@
 
 #include "cinderx/Jit/hir/annotation_index.h"
 
+#include "cinderx/Common/log.h"
 #include "cinderx/Jit/config.h"
 
+#include <algorithm>
+
 namespace cinderx::jit::hir {
 
 std::unique_ptr<AnnotationIndex> AnnotationIndex::fromFunction(
@@ -30,4 +33,45 @@ std::unique_ptr<AnnotationIndex> AnnotationIndex::fromFunction(
   return nullptr;
 }
 
+BorrowedRef<> AnnotationIndex::find(BorrowedRef<> name) const {
+  JIT_DCHECK(
+      reinterpret_cast<PyASCIIObject*>(name.getObj())->state.interned != 0,
+      "should be interned");
+  // annotations_ is sorted by key pointer (via std::less<Ref<>>), so this is a
+  // binary search by pointer identity.  It deliberately does not call
+  // SortedVecMap::find, which would require constructing an owning Ref<> and
+  // thus touch the Python C-API.
+  auto it = std::lower_bound(
+      annotations_.begin(),
+      annotations_.end(),
+      name,
+      [](const auto& entry, PyObject* rhs) { return entry.first.get() < rhs; });
+  if (it != annotations_.end() && it->first.get() == name) {
+    return it->second.get();
+  }
+  return nullptr;
+}
+
+// Built from the flattened (name, annotation, ...) tuple used before 3.14.
+AnnotationIndex::AnnotationIndex(BorrowedRef<PyTupleObject> annotations)
+    : owner_(Ref<>::create(annotations.getObj())) {
+  Py_ssize_t size = PyTuple_GET_SIZE(annotations.get());
+  for (Py_ssize_t index = 0; index + 1 < size; index += 2) {
+    BorrowedRef<> key = PyTuple_GET_ITEM(annotations.get(), index);
+    BorrowedRef<> value = PyTuple_GET_ITEM(annotations.get(), index + 1);
+    annotations_.emplace(Ref<>::create(key), Ref<>::create(value));
+  }
+}
+
+// Built from the __annotations__ dict used on 3.14+.
+AnnotationIndex::AnnotationIndex(BorrowedRef<PyDictObject> dict)
+    : owner_(Ref<>::create(dict.getObj())) {
+  PyObject* key = nullptr;
+  PyObject* value = nullptr;
+  Py_ssize_t pos = 0;
+  while (PyDict_Next(owner_, &pos, &key, &value)) {
+    annotations_.emplace(Ref<>::create(key), Ref<>::create(value));
+  }
+}
+
 } // namespace cinderx::jit::hir

cinderx/Jit/hir/annotation_index.h

@@ -2,11 +2,9 @@
 
 #pragma once
 
-#include "cinderx/Common/log.h"
 #include "cinderx/Common/ref.h"
 #include "cinderx/Common/sorted_vec_map.h"
 
-#include <algorithm>
 #include <memory>
 
 namespace cinderx::jit::hir {
@@ -26,55 +24,19 @@ namespace cinderx::jit::hir {
 // for correctness).
 class AnnotationIndex {
  public:
-  // Retrieve the annotation for the given name, or return nullptr.  Pure C++;
-  // safe to call with the GIL released.
-  //
-  // annotations_ is sorted by key pointer (via std::less<Ref<>>), so this is a
-  // binary search by pointer identity.  It deliberately does not call
-  // SortedVecMap::find, which would require constructing an owning Ref<> and
-  // thus touch the Python C-API.
-  BorrowedRef<> find(PyObject* name) const {
-    JIT_DCHECK(
-        reinterpret_cast<PyASCIIObject*>(name)->state.interned != 0,
-        "should be interned");
-    auto it = std::lower_bound(
-        annotations_.begin(),
-        annotations_.end(),
-        name,
-        [](const auto& entry, PyObject* rhs) {
-          return entry.first.get() < rhs;
-        });
-    if (it != annotations_.end() && it->first.get() == name) {
-      return it->second.get();
-    }
-    return nullptr;
-  }
-
   static std::unique_ptr<AnnotationIndex> fromFunction(
       BorrowedRef<PyFunctionObject> func);
 
+  // Retrieve the annotation for the given name, or return nullptr.  Pure C++;
+  // safe to call with the GIL released.
+  BorrowedRef<> find(BorrowedRef<> name) const;
+
  private:
   // Built from the flattened (name, annotation, ...) tuple used before 3.14.
-  explicit AnnotationIndex(BorrowedRef<PyTupleObject> annotations)
-      : owner_(Ref<>::create(annotations.getObj())) {
-    Py_ssize_t size = PyTuple_GET_SIZE(annotations.get());
-    for (Py_ssize_t index = 0; index + 1 < size; index += 2) {
-      BorrowedRef<> key = PyTuple_GET_ITEM(annotations.get(), index);
-      BorrowedRef<> value = PyTuple_GET_ITEM(annotations.get(), index + 1);
-      annotations_.emplace(Ref<>::create(key), Ref<>::create(value));
-    }
-  }
+  explicit AnnotationIndex(BorrowedRef<PyTupleObject> annotations);
 
   // Built from the __annotations__ dict used on 3.14+.
-  explicit AnnotationIndex(BorrowedRef<PyDictObject> dict)
-      : owner_(Ref<>::create(dict.getObj())) {
-    PyObject* key = nullptr;
-    PyObject* value = nullptr;
-    Py_ssize_t pos = 0;
-    while (PyDict_Next(owner_, &pos, &key, &value)) {
-      annotations_.emplace(Ref<>::create(key), Ref<>::create(value));
-    }
-  }
+  explicit AnnotationIndex(BorrowedRef<PyDictObject> dict);
 
   Ref<> owner_;
   SortedVecMap<Ref<>, Ref<>> annotations_;