Fix memory leaks under vm/test (#6142)

iree-org · Jun 8, 2021 · da141ef · da141ef
1 parent 76d30b6
commit da141ef
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/iree/vm/ref_test.cc b/iree/vm/ref_test.cc
@@ -134,10 +134,10 @@ TEST(VMRefTest, WrappingSubclassedRefObject) {
 TEST(VMRefTest, WrappingRequriesTypeRegistration) {
   iree_vm_ref_t ref = {0};
   int dummy = 0;
-  IREE_EXPECT_STATUS_IS(
-      IREE_STATUS_INVALID_ARGUMENT,
-      iree_vm_ref_wrap_assign(&dummy, static_cast<iree_vm_ref_type_t>(1234),
-                              &ref));
+  iree_status_t status = iree_vm_ref_wrap_assign(
+      &dummy, static_cast<iree_vm_ref_type_t>(1234), &ref);
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT, status);
+  iree_status_free(status);
 }
 
 // Tests that wrapping releases any existing ref in out_ref.
@@ -153,17 +153,19 @@ TEST(VMRefTest, WrappingReleasesExisting) {
 TEST(VMRefTest, CheckNull) {
   iree_vm_ref_t null_ref = {0};
   IREE_EXPECT_OK(iree_vm_ref_check(null_ref, IREE_VM_REF_TYPE_NULL));
-  IREE_EXPECT_STATUS_IS(
-      IREE_STATUS_INVALID_ARGUMENT,
-      iree_vm_ref_check(null_ref, static_cast<iree_vm_ref_type_t>(1234)));
+  iree_status_t status =
+      iree_vm_ref_check(null_ref, static_cast<iree_vm_ref_type_t>(1234));
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT, status);
+  iree_status_free(status);
 }
 
 // Tests type checks.
 TEST(VMRefTest, Check) {
   iree_vm_ref_t a_ref = MakeRef<A>("AType");
   IREE_EXPECT_OK(iree_vm_ref_check(a_ref, A::kTypeID));
-  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT,
-                        iree_vm_ref_check(a_ref, B::kTypeID));
+  iree_status_t status = iree_vm_ref_check(a_ref, B::kTypeID);
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT, status);
+  iree_status_free(status);
   iree_vm_ref_release(&a_ref);
 }
 
@@ -322,19 +324,21 @@ TEST(VMRefTest, RetainOrMoveCheckedMismatch) {
   // Retain.
   iree_vm_ref_t a_ref_0 = MakeRef<A>("AType");
   iree_vm_ref_t a_ref_1 = {0};
-  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT,
-                        iree_vm_ref_retain_or_move_checked(
-                            /*is_move=*/0, &a_ref_0, B::kTypeID, &a_ref_1));
+  iree_status_t status = iree_vm_ref_retain_or_move_checked(
+      /*is_move=*/0, &a_ref_0, B::kTypeID, &a_ref_1);
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT, status);
+  iree_status_free(status);
   EXPECT_EQ(0, iree_vm_ref_equal(&a_ref_0, &a_ref_1));
   EXPECT_EQ(1, ReadCounter(&a_ref_0));
   iree_vm_ref_release(&a_ref_0);
 
   // Move.
   iree_vm_ref_t b_ref_0 = MakeRef<B>("BType");
   iree_vm_ref_t b_ref_1 = {0};
-  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT,
-                        iree_vm_ref_retain_or_move_checked(
-                            /*is_move=*/1, &b_ref_0, A::kTypeID, &b_ref_1));
+  status = iree_vm_ref_retain_or_move_checked(
+      /*is_move=*/1, &b_ref_0, A::kTypeID, &b_ref_1);
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_INVALID_ARGUMENT, status);
+  iree_status_free(status);
   EXPECT_EQ(1, ReadCounter(&b_ref_0));
   iree_vm_ref_release(&b_ref_0);
 }

diff --git a/iree/vm/stack_test.cc b/iree/vm/stack_test.cc
@@ -126,8 +126,9 @@ TEST(VMStackTest, UnbalancedPop) {
   IREE_VM_INLINE_STACK_INITIALIZE(stack, state_resolver,
                                   iree_allocator_system());
 
-  IREE_EXPECT_STATUS_IS(IREE_STATUS_FAILED_PRECONDITION,
-                        iree_vm_stack_function_leave(stack));
+  iree_status_t status = iree_vm_stack_function_leave(stack);
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_FAILED_PRECONDITION, status);
+  iree_status_free(status);
 
   iree_vm_stack_deinitialize(stack);
 }
@@ -191,11 +192,10 @@ TEST(VMStackTest, ModuleStateQueryFailure) {
   iree_vm_function_t function_a = {MODULE_A_SENTINEL,
                                    IREE_VM_FUNCTION_LINKAGE_INTERNAL, 0};
   iree_vm_stack_frame_t* frame_a = nullptr;
-  IREE_EXPECT_STATUS_IS(
-      IREE_STATUS_INTERNAL,
-      iree_vm_stack_function_enter(
-          stack, &function_a, IREE_VM_STACK_FRAME_NATIVE, 0, NULL, &frame_a));
-
+  iree_status_t status = iree_vm_stack_function_enter(
+      stack, &function_a, IREE_VM_STACK_FRAME_NATIVE, 0, NULL, &frame_a);
+  IREE_EXPECT_STATUS_IS(IREE_STATUS_INTERNAL, status);
+  iree_status_free(status);
   iree_vm_stack_deinitialize(stack);
 }