f

Author: aaronj0

include/CppInterOp/CppInterOp.h

@@ -172,16 +172,19 @@ class JitCall {
   // decide to directly.
   void Invoke(void* result, ArgList args = {}, void* self = nullptr) const {
     // NOLINTBEGIN(*-type-union-access)
-    // Forward if we intended to call a dtor with only 1 parameter.
-    if (m_Kind == kDestructorCall && result && !args.m_Args) {
-      InvokeDestructor(result, /*nary=*/0UL, /*withFree=*/true);
-      return;
-    }
-    // Forward if we intended to call a constructor (nary cannot be inferred, so
-    // we stick to constructing a single object)
-    else if (m_Kind == kConstructorCall && result && !args.m_Args) {
-      InvokeConstructor(result, /*nary=*/1UL, args, self);
-      return;
+    // Its possible the JitCall object deals with structor decls but went through Invoke
+    if (result && !args.m_Args && m_Kind!=kGenericCall) {
+      // Forward if we intended to call a dtor with only 1 parameter.
+      if (m_Kind == kDestructorCall) {
+          InvokeDestructor(result, /*nary=*/0UL, /*withFree=*/true);
+          return;
+      }
+      // Forward if we intended to call a constructor (nary cannot be inferred, so
+      // we stick to constructing a single object)
+      if (m_Kind == kConstructorCall) {
+          InvokeConstructor(result, /*nary=*/1UL, args, self);
+          return;
+      }
     }
 
 #ifndef NDEBUG