Convert ModuleState from class with getters/setters to struct with public fields

Summary:
Replace the ModuleState class's private fields and accessor methods with a plain
struct with public fields.  This is much simpler, the getter/setters were just a
lot of needless boilerplate.

The traverse(), clear(), and initBuiltinMembers() methods are retained.

Add comments to try to explain what all these fields do as well.

Reviewed By: DinoV

Differential Revision: D96480101

fbshipit-source-id: 34e8393359cd4d40c93d019bbe7c0ee744888e77

Author: alexmalyshev

cinderx/Jit/codegen/frame_asm.cpp

@@ -504,7 +504,7 @@ void FrameAsm::linkLightWeightFunctionFrame(
 
   int frame_header_size = frameHeaderSizeExcludingSpillSpace();
 #if PY_VERSION_HEX < 0x030E0000
-  PyObject* frame_reifier = cinderx::getModuleState()->frameReifier();
+  PyObject* frame_reifier = cinderx::getModuleState()->frame_reifier;
 #else
   PyObject* frame_reifier = env_.code_rt->reifier();
 #endif
@@ -666,7 +666,7 @@ void FrameAsm::linkLightWeightFunctionFrame(
 
   int frame_header_size = frameHeaderSizeExcludingSpillSpace();
 #if PY_VERSION_HEX < 0x030E0000
-  PyObject* frame_reifier = cinderx::getModuleState()->frameReifier();
+  PyObject* frame_reifier = cinderx::getModuleState()->frame_reifier;
 #else
   PyObject* frame_reifier = env_.code_rt->reifier();
 #endif

cinderx/Jit/codegen/gen_asm.cpp

@@ -427,7 +427,8 @@ void* finalizeCode(arch::Builder& builder, std::string_view name) {
         DebugUtils::errorAsString(err))};
   }
 
-  ICodeAllocator* code_allocator = cinderx::getModuleState()->codeAllocator();
+  ICodeAllocator* code_allocator =
+      cinderx::getModuleState()->code_allocator.get();
   AllocateResult result = code_allocator->addCode(builder.code());
   if (result.error != kErrorOk) {
     throw std::runtime_error{fmt::format(
@@ -452,7 +453,7 @@ void* generateDeoptTrampoline(bool generator_mode) {
       generator_mode ? "deopt_trampoline_generators" : "deopt_trampoline";
 
   CodeHolder code;
-  ICodeAllocator* code_allocator = mod_state->codeAllocator();
+  ICodeAllocator* code_allocator = mod_state->code_allocator.get();
   ASM_CHECK(code.init(code_allocator->asmJitEnvironment()), name);
   arch::Builder a(&code);
   Annotations annot;
@@ -900,7 +901,7 @@ void* generateFailedDeferredCompileTrampoline() {
         "CinderX not initialized, cannot generate deopt trampolines"};
   }
   CodeHolder code;
-  ICodeAllocator* code_allocator = mod_state->codeAllocator();
+  ICodeAllocator* code_allocator = mod_state->code_allocator.get();
   code.init(code_allocator->asmJitEnvironment());
   arch::Builder a(&code);
   Annotations annot;
@@ -1146,7 +1147,8 @@ void* NativeGenerator::getVectorcallEntry() {
   JIT_CHECK(as_ == nullptr, "Builder should not have been initialized.");
 
   CodeHolder code;
-  ICodeAllocator* code_allocator = cinderx::getModuleState()->codeAllocator();
+  ICodeAllocator* code_allocator =
+      cinderx::getModuleState()->code_allocator.get();
   code.init(code_allocator->asmJitEnvironment());
   ThrowableErrorHandler eh;
   code.setErrorHandler(&eh);
@@ -2373,7 +2375,7 @@ Py_ssize_t NativeGenerator::giJITDataOffset() {
   Py_ssize_t python_frame_slots =
       _PyFrame_NumSlotsForCodeObject(GetFunction()->code);
   return _PyObject_VAR_SIZE(
-      cinderx::getModuleState()->genType(), python_frame_slots);
+      cinderx::getModuleState()->gen_type, python_frame_slots);
 #endif
 }
 

cinderx/Jit/compiled_function.cpp

@@ -19,7 +19,7 @@ bool isJitCompiled(const PyFunctionObject* func) {
   if (mod_state == nullptr) {
     return false;
   }
-  jit::ICodeAllocator* code_allocator = mod_state->codeAllocator();
+  jit::ICodeAllocator* code_allocator = mod_state->code_allocator.get();
   return code_allocator != nullptr &&
       code_allocator->contains(reinterpret_cast<const void*>(func->vectorcall));
 }
@@ -33,7 +33,7 @@ CompiledFunction::~CompiledFunction() {
     data_.runtime->releaseReferences();
   }
 
-  auto code_allocator = cinderx::getModuleState()->codeAllocator();
+  auto code_allocator = cinderx::getModuleState()->code_allocator.get();
   code_allocator->releaseCode(const_cast<std::byte*>(data_.code.data()));
 }
 

cinderx/Jit/context.cpp

@@ -349,7 +349,7 @@ void Context::watchType(
   }
 
   JIT_CHECK(
-      cinderx::getModuleState()->watcherState().watchType(type) == 0,
+      cinderx::getModuleState()->watcher_state.watchType(type) == 0,
       "Failed to watch type {}",
       type->tp_name);
 }
@@ -365,7 +365,7 @@ BorrowedRef<> Context::strBuildClass() {
 void Context::watchPendingTypes() {
   for (auto& type : pending_watches_) {
     JIT_CHECK(
-        cinderx::getModuleState()->watcherState().watchType(type) == 0,
+        cinderx::getModuleState()->watcher_state.watchType(type) == 0,
         "Failed to watch pending type {}",
         type->tp_name);
   }
@@ -684,7 +684,7 @@ Context* getContext() {
   if (state == nullptr) {
     return nullptr;
   }
-  return static_cast<Context*>(state->jitContext());
+  return static_cast<Context*>(state->jit_context.get());
 }
 
 } // namespace jit

cinderx/Jit/frame.cpp

@@ -38,7 +38,7 @@ CodeRuntime* getCodeRuntime(_PyInterpreterFrame* frame) {
     func = jitFrameGetFunction(frame);
   }
 
-  return cinderx::getModuleState()->jitContext()->lookupCodeRuntime(func);
+  return cinderx::getModuleState()->jit_context->lookupCodeRuntime(func);
 }
 
 #if PY_VERSION_HEX >= 0x030E0000
@@ -61,7 +61,7 @@ bool isJitFrame(_PyInterpreterFrame* frame) {
   return PyUnstable_JITExecutable_Check(code) &&
       ((PyUnstable_PyJitExecutable*)code)->je_reifier == &reifyRunningFrame;
 #else
-  return frameFunction(frame) == cinderx::getModuleState()->frameReifier();
+  return frameFunction(frame) == cinderx::getModuleState()->frame_reifier;
 #endif
 
 #else
@@ -532,9 +532,9 @@ void jitFrameInitLightweight(
   frame->prev_instr = _PyCode_CODE(code) - 1;
   setFrameCode(frame, (PyObject*)code);
   JIT_DCHECK(
-      _Py_IsImmortal(cinderx::getModuleState()->frameReifier()),
+      _Py_IsImmortal(cinderx::getModuleState()->frame_reifier),
       "frame helper must be immortal");
-  setFrameFunction(frame, cinderx::getModuleState()->frameReifier());
+  setFrameFunction(frame, cinderx::getModuleState()->frame_reifier);
   jitFrameSetFunction(frame, (PyFunctionObject*)Py_NewRef(func));
 #endif
   frame->previous = previous;

cinderx/Jit/gen_data_footer.cpp

@@ -12,7 +12,7 @@ GenDataFooter** jitGenDataFooterPtr(PyGenObject* gen, PyCodeObject* gen_code) {
   // use PyObject_VAR_HEAD like it probably should this would get simpler. If
   // we expanded the allocation to include the GenDataFooter it'd get simpler
   // still.
-  BorrowedRef<PyTypeObject> gen_type = cinderx::getModuleState()->genType();
+  BorrowedRef<PyTypeObject> gen_type = cinderx::getModuleState()->gen_type;
 
   size_t python_frame_data_bytes =
       _PyFrame_NumSlotsForCodeObject(gen_code) * gen_type->tp_itemsize;

cinderx/Jit/generators_core.cpp

@@ -13,7 +13,7 @@
 namespace jit {
 
 bool jitgen_is_coroutine(PyObject* o) {
-  if (Py_TYPE(o) != cinderx::getModuleState()->genType() &&
+  if (Py_TYPE(o) != cinderx::getModuleState()->gen_type &&
       !PyGen_CheckExact(o)) {
     return false;
   }
@@ -29,11 +29,11 @@ bool jitgen_is_coroutine(PyObject* o) {
 
 extern "C" {
 int JitGen_CheckExact(PyObject* o) {
-  return Py_TYPE(o) == cinderx::getModuleState()->genType();
+  return Py_TYPE(o) == cinderx::getModuleState()->gen_type;
 }
 
 int JitCoro_CheckExact(PyObject* o) {
-  return Py_TYPE(o) == cinderx::getModuleState()->coroType();
+  return Py_TYPE(o) == cinderx::getModuleState()->coro_type;
 }
 
 // This is a slightly modified version of _PyCoro_GetAwaitableIter. It

cinderx/Jit/generators_mm.cpp

@@ -29,13 +29,13 @@ size_t computeSlots(BorrowedRef<PyCodeObject> code, uint64_t jit_data_size) {
 std::pair<JitGenObject*, size_t> allocateNonFreeList(
     size_t slots,
     bool is_coro) {
-  BorrowedRef<PyTypeObject> gen_tp = cinderx::getModuleState()->genType();
+  BorrowedRef<PyTypeObject> gen_tp = cinderx::getModuleState()->gen_type;
   // All the generator types should be the same size.
   size_t size = _PyObject_VAR_SIZE(gen_tp, slots);
 
   JitGenObject* gen = is_coro
       ? reinterpret_cast<JitGenObject*>(PyObject_GC_NewVar(
-            PyCoroObject, cinderx::getModuleState()->coroType(), slots))
+            PyCoroObject, cinderx::getModuleState()->coro_type, slots))
       : reinterpret_cast<JitGenObject*>(
             PyObject_GC_NewVar(PyGenObject, gen_tp, slots));
   // See comment in allocate_and_link_interpreter_frame about failure.
@@ -62,7 +62,7 @@ void* JitGenFreeList::rawAllocate() {
   // The memory for the free-list is backed by the module state, so bump the
   // reference count to prevent it being free'd before all free-listed
   // generators are.
-  Py_INCREF(cinderx::getModuleState()->module());
+  Py_INCREF(cinderx::getModuleState()->cinderx_module);
   return entry->data;
 }
 
@@ -88,13 +88,13 @@ void JitGenFreeList::free(PyObject* ptr) {
   entry->next = head_;
   head_ = entry;
   // See comment in rawAllocate()
-  Py_DECREF(cinderx::getModuleState()->module());
+  Py_DECREF(cinderx::getModuleState()->cinderx_module);
 }
 
 std::pair<JitGenObject*, size_t> JitGenFreeList::allocate(
     BorrowedRef<PyCodeObject> code,
     uint64_t jit_data_size) {
-  BorrowedRef<PyTypeObject> gen_tp = cinderx::getModuleState()->genType();
+  BorrowedRef<PyTypeObject> gen_tp = cinderx::getModuleState()->gen_type;
   // We *assume* these assertions hold in free().
   JIT_DCHECK_ONCE(
       _PyType_PreHeaderSize(gen_tp) == sizeof(PyGC_Head) &&
@@ -126,7 +126,7 @@ std::pair<JitGenObject*, size_t> JitGenFreeList::allocate(
       reinterpret_cast<PyVarObject*>( // NOLINT(performance-no-int-to-ptr)
           reinterpret_cast<uintptr_t>(raw) + sizeof(PyGC_Head));
 
-  PyTypeObject* tp = is_coro ? cinderx::getModuleState()->coroType() : gen_tp;
+  PyTypeObject* tp = is_coro ? cinderx::getModuleState()->coro_type : gen_tp;
   _PyObject_InitVar(op, tp, slots);
 
   return {reinterpret_cast<JitGenObject*>(op), size};

cinderx/Jit/generators_rt.cpp

@@ -97,7 +97,7 @@ void raise_already_running_exception(JitGenObject* jit_gen) {
   // If the executor is running we cannot deopt so have to replicate the
   // errors from CPython here.
   const char* msg = "generator already executing";
-  if (Py_TYPE(jit_gen) == cinderx::getModuleState()->coroType()) {
+  if (Py_TYPE(jit_gen) == cinderx::getModuleState()->coro_type) {
     msg = "coroutine already executing";
   }
   PyErr_SetString(PyExc_ValueError, msg);
@@ -707,7 +707,7 @@ PyType_Spec JitCoro_Spec = {
 void deopt_jit_gen_object_only(JitGenObject* gen) {
   PyTypeObject* old_type = Py_TYPE(gen);
 
-  PyTypeObject* type = Py_TYPE(gen) == cinderx::getModuleState()->genType()
+  PyTypeObject* type = Py_TYPE(gen) == cinderx::getModuleState()->gen_type
       ? &PyGen_Type
       : &PyCoro_Type;
   Py_DECREF(old_type);
@@ -771,8 +771,8 @@ bool deopt_jit_gen(PyObject* obj) {
 void init_jit_genobject_type() {
   using namespace std::literals;
   // Copy base type functions
-  BorrowedRef<PyTypeObject> gen_type = cinderx::getModuleState()->genType();
-  BorrowedRef<PyTypeObject> coro_type = cinderx::getModuleState()->coroType();
+  BorrowedRef<PyTypeObject> gen_type = cinderx::getModuleState()->gen_type;
+  BorrowedRef<PyTypeObject> coro_type = cinderx::getModuleState()->coro_type;
 
   gen_type->tp_repr = PyGen_Type.tp_repr;
 
@@ -865,10 +865,10 @@ void init_jit_genobject_type() {
   copy_methods(PyCoro_Type.tp_methods, coro_type->tp_methods);
 
 #ifdef Py_GIL_DISABLED
-  cinderx::getModuleState()->setJitGenFreeList(
+  cinderx::getModuleState()->jit_gen_free_list.reset(
       new JITGenFreeThreadedFreeList());
 #else
-  cinderx::getModuleState()->setJitGenFreeList(new JitGenFreeList());
+  cinderx::getModuleState()->jit_gen_free_list.reset(new JitGenFreeList());
 #endif
 
   // Override dealloc so we can use a "free-list" for our objects.
@@ -927,7 +927,7 @@ PyObject* JitGen_AnextAwaitable_New(
     PyObject* awaitable,
     PyObject* defaultValue) {
   anextawaitableobject* anext =
-      PyObject_GC_New(anextawaitableobject, moduleState->anextAwaitableType());
+      PyObject_GC_New(anextawaitableobject, moduleState->anext_awaitable_type);
   if (anext == nullptr) {
     return nullptr;
   }

cinderx/Jit/generators_rt.h

@@ -38,10 +38,10 @@ template <typename PyObjectT>
 int JitGen_CheckAny(PyObjectT* op) {
   return Py_IS_TYPE(
              reinterpret_cast<PyObject*>(op),
-             cinderx::getModuleState()->genType()) ||
+             cinderx::getModuleState()->gen_type) ||
       Py_IS_TYPE(
              reinterpret_cast<PyObject*>(op),
-             cinderx::getModuleState()->coroType());
+             cinderx::getModuleState()->coro_type);
 }
 
 struct JitGenObject : PyGenObject {