Merge pull request #15770 from dcci/refcount-obj

Author: swift-ci

include/swift/Runtime/HeapObject.h

@@ -231,6 +231,8 @@ SWIFT_RUNTIME_EXPORT
 size_t swift_retainCount(HeapObject *object);
 SWIFT_RUNTIME_EXPORT
 size_t swift_unownedRetainCount(HeapObject *object);
+SWIFT_RUNTIME_EXPORT
+size_t swift_weakRetainCount(HeapObject *object);
 
 /// Is this pointer a non-null unique reference to an object
 /// that uses Swift reference counting?

stdlib/public/SwiftShims/HeapObject.h

@@ -13,6 +13,7 @@
 #define SWIFT_STDLIB_SHIMS_HEAPOBJECT_H
 
 #include "RefCount.h"
+#include "SwiftStddef.h"
 #include "System.h"
 
 #define SWIFT_ABI_HEAP_OBJECT_HEADER_SIZE_64 16
@@ -30,6 +31,7 @@ template <typename Target> struct TargetHeapMetadata;
 using HeapMetadata = TargetHeapMetadata<InProcess>;
 #else
 typedef struct HeapMetadata HeapMetadata;
+typedef struct HeapObject HeapObject;
 #endif
 
 // The members of the HeapObject header that are not shared by a
@@ -69,6 +71,15 @@ SWIFT_RUNTIME_STDLIB_INTERFACE
 void _swift_instantiateInertHeapObject(void *address,
                                        const HeapMetadata *metadata);
 
+SWIFT_RUNTIME_STDLIB_INTERFACE
+__swift_size_t swift_retainCount(HeapObject *obj);
+
+SWIFT_RUNTIME_STDLIB_INTERFACE
+__swift_size_t swift_unownedRetainCount(HeapObject *obj);
+
+SWIFT_RUNTIME_STDLIB_INTERFACE
+__swift_size_t swift_weakRetainCount(HeapObject *obj);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

stdlib/public/core/DebuggerSupport.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import SwiftShims
+
 @_frozen // FIXME(sil-serialize-all)
 public enum _DebuggerSupport {
   @_frozen // FIXME(sil-serialize-all)
@@ -335,3 +337,11 @@ func _stringForPrintObject(_ value: Any) -> String {
 public
 func _debuggerTestingCheckExpect(_ checked_value: String,
                                  _ expected_value: String) {}
+
+// Utilities to get refcount(s) of class objects.
+@_silgen_name("swift_retainCount")
+public func _getRetainCount(_ Value: AnyObject) -> UInt
+@_silgen_name("swift_unownedRetainCount")
+public func _getUnownedRetainCount(_ Value : AnyObject) -> UInt
+@_silgen_name("swift_weakRetainCount")
+public func _getWeakRetainCount(_ Value : AnyObject) -> UInt

stdlib/public/runtime/HeapObject.cpp

@@ -372,6 +372,10 @@ size_t swift::swift_unownedRetainCount(HeapObject *object) {
   return object->refCounts.getUnownedCount();
 }
 
+size_t swift::swift_weakRetainCount(HeapObject *object) {
+  return object->refCounts.getWeakCount();
+}
+
 HeapObject *swift::swift_unownedRetain(HeapObject *object) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_unownedRetain);
   if (!isValidPointerForNativeRetain(object))

test/stdlib/DebuggerSupport.swift

@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: optimized_stdlib
 
 import StdlibUnittest
 
@@ -99,4 +100,31 @@ StringForPrintObjectTests.test("DontBridgeThisStruct") {
 }
 #endif
 
+class RefCountedObj {
+  var patatino : Int
+  init(_ p : Int) {
+    self.patatino = p
+  }
+  public func f() -> Int {
+    return self.patatino
+  }
+}
+
+let RefcountTests = TestSuite("RefCount")
+RefcountTests.test("Basic") {
+  var Obj = RefCountedObj(47);
+
+  // Counters for live objects should be always positive.
+  // We try to be a little bit more lax here because optimizations
+  // or different stdlib versions might impact the exact value of
+  // refcounting, and we're just interested in testing whether the
+  // stub works properly.
+  expectGT(_getRetainCount(Obj), 0);
+  expectGT(_getWeakRetainCount(Obj), 0);
+  expectGT(_getUnownedRetainCount(Obj), 0);
+
+  // Try to keep the object live here.
+  let _ = Obj.f()
+}
+
 runAllTests()