Merge pull request #22798 from bob-wilson/sr-9654-5.0

[SILProfiler] Skip source regions with invalid locations

Author: bob-wilson

lib/SIL/SILProfiler.cpp

@@ -42,6 +42,10 @@ static bool doesClosureHaveBody(AbstractClosureExpr *ACE) {
 
 /// Check whether a root AST node is unmapped, i.e not profiled.
 static bool isUnmapped(ASTNode N) {
+  // Do not map AST nodes with invalid source locations.
+  if (N.getStartLoc().isInvalid() || N.getEndLoc().isInvalid())
+    return true;
+
   if (auto *E = N.dyn_cast<Expr *>()) {
     auto *CE = dyn_cast<AbstractClosureExpr>(E);
 
@@ -396,7 +400,12 @@ class SourceMappingRegion {
 public:
   SourceMappingRegion(ASTNode Node, CounterExpr &Count,
                       Optional<SourceLoc> StartLoc, Optional<SourceLoc> EndLoc)
-      : Node(Node), Count(&Count), StartLoc(StartLoc), EndLoc(EndLoc) {}
+      : Node(Node), Count(&Count), StartLoc(StartLoc), EndLoc(EndLoc) {
+    assert((!StartLoc || StartLoc->isValid()) &&
+           "Expected start location to be valid");
+    assert((!EndLoc || EndLoc->isValid()) &&
+           "Expected start location to be valid");
+  }
 
   SourceMappingRegion(SourceMappingRegion &&Region) = default;
   SourceMappingRegion &operator=(SourceMappingRegion &&RHS) = default;

test/Profiler/coverage_subscript_autoclosure.swift

@@ -0,0 +1,15 @@
+// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -enable-testing -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_subscript_autoclosure %s | %FileCheck %s
+
+struct S {
+  subscript(i: Int, autoclosure: @autoclosure () ->  Int) -> Int {
+    // CHECK-LABEL: sil_coverage_map {{.*}}S.subscript.getter
+    get { // CHECK-NEXT: [[@LINE]]:9 -> [[@LINE+2]]:6 : 0
+      return 0
+    }
+
+    // CHECK-LABEL: sil_coverage_map {{.*}}S.subscript.setter
+    set { // CHECK-NEXT: [[@LINE]]:9 -> [[@LINE+2]]:6 : 0
+
+    }
+  }
+}