Update on "[wip] Add MergedDataMap to method"

lucylq · lucylq · commit 9d831663cc8c · 2025-07-02T16:48:31.000-07:00
Differential Revision: [D77472917](https://our.internmc.facebook.com/intern/diff/D77472917/) [ghstack-poisoned]
diff --git a/runtime/executor/method.cpp b/runtime/executor/method.cpp
@@ -1693,7 +1693,9 @@ Method::~Method() {
     external_constants_[i].buffer.~FreeableBuffer();
   }
   // Free the MergedDataMap
-  merged_data_map_->~MergedDataMap<2>();
+  if (merged_data_map_ != nullptr) {
+    merged_data_map_->~MergedDataMap<2>();
+  }
   // All other fields are trivially destructible.
 }
 } // namespace ET_RUNTIME_NAMESPACE

Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,9 @@ Method::~Method() {`
`1693`	`1693`	`external_constants_[i].buffer.~FreeableBuffer();`
`1694`	`1694`	`}`
`1695`	`1695`	`// Free the MergedDataMap`
`1696`		`- merged_data_map_->~MergedDataMap<2>();`
	`1696`	`+ if (merged_data_map_ != nullptr) {`
	`1697`	`+ merged_data_map_->~MergedDataMap<2>();`
	`1698`	`+ }`
`1697`	`1699`	`// All other fields are trivially destructible.`
`1698`	`1700`	`}`
`1699`	`1701`	`} // namespace ET_RUNTIME_NAMESPACE`