Merge pull request #60509 from hamishknight/insurance-claim

Author: hamishknight

lib/SILGen/SILGen.cpp

@@ -1079,6 +1079,7 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
     auto *dd = cast<DestructorDecl>(constant.getDecl());
     preEmitFunction(constant, f, dd);
     PrettyStackTraceSILFunction X("silgen emitDestroyingDestructor", f);
+    f->createProfiler(dd, constant, ForDefinition);
     SILGenFunction(*this, *f, dd).emitDestroyingDestructor(dd);
     postEmitFunction(constant, f);
     return;
@@ -1100,7 +1101,6 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
     auto loc = RegularLocation::getAutoGeneratedLocation(dd);
     preEmitFunction(constant, f, loc);
     PrettyStackTraceSILFunction X("silgen emitDeallocatingDestructor", f);
-    f->createProfiler(dd, constant, ForDefinition);
     SILGenFunction(*this, *f, dd).emitDeallocatingDestructor(dd);
     postEmitFunction(constant, f);
     return;

lib/SILGen/SILGenDestructor.cpp

@@ -207,8 +207,6 @@ void SILGenFunction::emitDeallocatingDestructor(DestructorDecl *dd) {
   selfForDealloc = B.createUncheckedRefCast(loc, selfForDealloc, classTy);
   B.createDeallocRef(loc, selfForDealloc);
 
-  emitProfilerIncrement(dd->getTypecheckedBody());
-
   // Return.
   B.createReturn(loc, emitEmptyTuple(loc));
 }

test/Profiler/coverage_class.swift

@@ -10,7 +10,7 @@ class C {
   // CHECK-NEXT: [[@LINE+1]]:10 -> [[@LINE+1]]:12
   init() {}
 
-  // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_class.C.__deallocating_deinit
+  // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_class.C.deinit
   // CHECK-NEXT: [[@LINE+1]]:10 -> [[@LINE+1]]:12
   deinit {}
 }

test/Profiler/coverage_deinit.swift

@@ -1,16 +1,30 @@
 // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_deinit %s | %FileCheck %s
 // RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -emit-ir %s
-// REQUIRES: objc_interop
 
-import Foundation
+func foo() {}
 
-public class Derived: NSString {
-  // CHECK-LABEL: sil @$s15coverage_deinit7DerivedCfD
-  // CHECK: builtin "int_instrprof_increment"
-  // CHECK-NEXT: super_method {{.*}} : $Derived, #NSString.deinit!deallocator.foreign
+public class Foo {
+  // CHECK-LABEL: sil @$s15coverage_deinit3FooCfd
+  // CHECK:       integer_literal $Builtin.Int64, 0
+  // CHECK:       integer_literal $Builtin.Int32, 2
+  // CHECK:       integer_literal $Builtin.Int32, 0
+  // CHECK-NEXT:  builtin "int_instrprof_increment"
+  // CHECK:       function_ref @$sSb6randomSbyFZ
+  // CHECK:       cond_br
+  // CHECK:       integer_literal $Builtin.Int64, 0
+  // CHECK:       integer_literal $Builtin.Int32, 2
+  // CHECK:       integer_literal $Builtin.Int32, 1
+  // CHECK-NEXT:  builtin "int_instrprof_increment"
+  // CHECK-NEXT:  // function_ref coverage_deinit.foo() -> ()
   deinit {
+    if .random() {
+      foo()
+    }
   }
 }
 
-// CHECK-LABEL: sil_coverage_map "{{.*}}coverage_deinit.swift" "$s15coverage_deinit7DerivedCfD"
-// CHECK-NEXT: [[@LINE-5]]:10 -> [[@LINE-4]]:4 : 0
+// CHECK-LABEL: sil_coverage_map "{{.*}}coverage_deinit.swift" "$s15coverage_deinit3FooCfd"
+// CHECK-NEXT: [[@LINE-8]]:10 -> [[@LINE-4]]:4 : 0
+// CHECK-NEXT: [[@LINE-8]]:8 -> [[@LINE-8]]:17 : 0
+// CHECK-NEXT: [[@LINE-9]]:18 -> [[@LINE-7]]:6 : 1
+// CHECK-NEXT: [[@LINE-8]]:6 -> [[@LINE-7]]:4 : 0

test/Profiler/coverage_deinit_objc.swift

@@ -0,0 +1,16 @@
+// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_deinit %s | %FileCheck %s
+// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -emit-ir %s
+// REQUIRES: objc_interop
+
+import Foundation
+
+public class Derived: NSString {
+  // CHECK-LABEL: sil @$s15coverage_deinit7DerivedCfD
+  // CHECK: builtin "int_instrprof_increment"
+  // CHECK-NEXT: super_method {{.*}} : $Derived, #NSString.deinit!deallocator.foreign
+  deinit {
+  }
+}
+
+// CHECK-LABEL: sil_coverage_map "{{.*}}coverage_deinit_objc.swift" "$s15coverage_deinit7DerivedCfD"
+// CHECK-NEXT: [[@LINE-5]]:10 -> [[@LINE-4]]:4 : 0