Fix up mismerge of refcounting unit tests.

Author: jckarter

unittests/runtime/Refcounting.cpp

@@ -98,30 +98,13 @@ TEST(RefcountingTest, pin_pin_unpin_unpin) {
   EXPECT_EQ(1u, value);
 }
 
-static unsigned _retainCount(HeapObject *object) {
-  return object->refCount.getCount();
-}
-static unsigned _unownedRetainCount(HeapObject *object) {
-  return object->weakRefCount.getCount();
-}
-
 TEST(RefcountingTest, retain_release_n) {
   size_t value = 0;
   auto object = allocTestObject(&value, 1);
   EXPECT_EQ(0u, value);
   swift_retain_n(object, 32);
   swift_retain(object);
   EXPECT_EQ(0u, value);
-  EXPECT_EQ(34u, _retainCount(object));
-  swift_release_n(object, 31);
-  EXPECT_EQ(0u, value);
-  EXPECT_EQ(3u, _retainCount(object));
-  swift_release(object);
-  EXPECT_EQ(0u, value);
-  EXPECT_EQ(2u, _retainCount(object));
-  swift_release_n(object, 1);
-  EXPECT_EQ(0u, value);
-  EXPECT_EQ(1u, _retainCount(object));
   EXPECT_EQ(34u, swift_retainCount(object));
   swift_release_n(object, 31);
   EXPECT_EQ(0u, value);
@@ -132,8 +115,6 @@ TEST(RefcountingTest, retain_release_n) {
   swift_release_n(object, 1);
   EXPECT_EQ(0u, value);
   EXPECT_EQ(1u, swift_retainCount(object));
-  swift_release(object);
-  EXPECT_EQ(1u, value);
 }
 
 TEST(RefcountingTest, unknown_retain_release_n) {
@@ -143,16 +124,6 @@ TEST(RefcountingTest, unknown_retain_release_n) {
   swift_unknownRetain_n(object, 32);
   swift_unknownRetain(object);
   EXPECT_EQ(0u, value);
-  EXPECT_EQ(34u, _retainCount(object));
-  swift_unknownRelease_n(object, 31);
-  EXPECT_EQ(0u, value);
-  EXPECT_EQ(3u, _retainCount(object));
-  swift_unknownRelease(object);
-  EXPECT_EQ(0u, value);
-  EXPECT_EQ(2u, _retainCount(object));
-  swift_unknownRelease_n(object, 1);
-  EXPECT_EQ(0u, value);
-  EXPECT_EQ(1u, _retainCount(object));
   EXPECT_EQ(34u, swift_retainCount(object));
   swift_unknownRelease_n(object, 31);
   EXPECT_EQ(0u, value);
@@ -163,8 +134,6 @@ TEST(RefcountingTest, unknown_retain_release_n) {
   swift_unknownRelease_n(object, 1);
   EXPECT_EQ(0u, value);
   EXPECT_EQ(1u, swift_retainCount(object));
-  swift_unknownRelease(object);
-  EXPECT_EQ(1u, value);
 }
 
 TEST(RefcountingTest, unowned_retain_release_n) {
@@ -173,13 +142,6 @@ TEST(RefcountingTest, unowned_retain_release_n) {
   EXPECT_EQ(0u, value);
   swift_unownedRetain_n(object, 32);
   swift_unownedRetain(object);
-  EXPECT_EQ(34u, _unownedRetainCount(object));
-  swift_unownedRelease_n(object, 31);
-  EXPECT_EQ(3u, _unownedRetainCount(object));
-  swift_unownedRelease(object);
-  EXPECT_EQ(2u, _unownedRetainCount(object));
-  swift_unownedRelease_n(object, 1);
-  EXPECT_EQ(1u, _unownedRetainCount(object));
   EXPECT_EQ(34u, swift_unownedRetainCount(object));
   swift_unownedRelease_n(object, 31);
   EXPECT_EQ(3u, swift_unownedRetainCount(object));