Merge branch 'master' of github.com:facebook/FBRetainCycleDetector

facebook · Nov 20, 2017 · d41dde7 · d41dde7
2 parents 013362e + fbb0053
commit d41dde7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/FBRetainCycleDetector/Detector/FBRetainCycleDetector.mm b/FBRetainCycleDetector/Detector/FBRetainCycleDetector.mm
@@ -69,6 +69,21 @@ - (void)addCandidate:(id)candidate
   [_candidates removeAllObjects];
   [_objectSet removeAllObjects];
 
+  // Filter cycles that have been broken down since we found them.
+  // These are false-positive that were picked-up and are transient cycles.
+  NSMutableSet<NSArray<FBObjectiveCGraphElement *> *> *brokenCycles = [NSMutableSet set];
+  for (NSArray<FBObjectiveCGraphElement *> *itemCycle in allRetainCycles) {
+    for (FBObjectiveCGraphElement *element in itemCycle) {
+      if (element.object == nil) {
+        // At least one element of the cycle has been removed, thus breaking
+        // the cycle.
+        [brokenCycles addObject:itemCycle];
+        break;
+      }
+    }
+  }
+  [allRetainCycles minusSet:brokenCycles];
+
   return allRetainCycles;
 }
 

diff --git a/FBRetainCycleDetector/Graph/FBObjectiveCBlock.m b/FBRetainCycleDetector/Graph/FBObjectiveCBlock.m
@@ -72,7 +72,7 @@ - (NSString *)classNameOrNull
 {
   NSString *className = NSStringFromClass([self objectClass]);
   if (!className) {
-    className = @"Null";
+    className = @"(null)";
   }
 
   if (!self.configuration.shouldIncludeBlockAddress) {

diff --git a/FBRetainCycleDetector/Graph/FBObjectiveCGraphElement.mm b/FBRetainCycleDetector/Graph/FBObjectiveCGraphElement.mm
@@ -116,7 +116,7 @@ - (NSString *)classNameOrNull
 {
   NSString *className = NSStringFromClass([self objectClass]);
   if (!className) {
-    className = @"Null";
+    className = @"(null)";
   }
 
   return className;