[Coverage] Check decl location for generated source

Previously for a property initializer, we would
check whether the initialization expr is generated
code, and skip profiling the property in that case.
However if the property itself isn't generated,
profiling is still reasonable. Switch the check
here to look at the SILDeclRef's location.

Author: hamishknight

lib/SIL/IR/SILProfiler.cpp

@@ -95,17 +95,18 @@ static bool shouldProfile(SILDeclRef Constant) {
                  << "Skipping ASTNode: invalid start/end locations\n");
       return false;
     }
+  }
 
-    // Do not profile generated code. This includes macro expansions, which we
-    // otherwise consider to be "written by the user", because they wrote the
-    // macro attribute or expr. We may want to revist this in the future. We'll
-    // need to figure out how we'll be writing out the macro expansions though,
-    // such that they can be referenced by llvm-cov.
-    // Note we check `getSourceFileContainingLocation` instead of
-    // `getParentSourceFile` to make sure initializer exprs are correctly
-    // handled.
+  // Do not profile generated code. This includes macro expansions, which we
+  // otherwise consider to be "written by the user", because they wrote the
+  // macro attribute or expr. We may want to revist this in the future. We'll
+  // need to figure out how we'll be writing out the macro expansions though,
+  // such that they can be referenced by llvm-cov.
+  // Note we check `getSourceFileContainingLocation` instead of
+  // `getParentSourceFile` to make sure properties are correctly handled.
+  if (auto Loc = Constant.getAsRegularLocation()) {
     auto *M = DC->getParentModule();
-    if (auto *SF = M->getSourceFileContainingLocation(N.getStartLoc())) {
+    if (auto *SF = M->getSourceFileContainingLocation(Loc.getSourceLoc())) {
       auto &SM = M->getASTContext().SourceMgr;
       if (SM.hasGeneratedSourceInfo(*SF->getBufferID())) {
         LLVM_DEBUG(llvm::dbgs() << "Skipping ASTNode: generated code\n");

test/Profiler/coverage_macros.swift

@@ -34,6 +34,13 @@ macro BodyMacroWithControlFlow() = #externalMacro(module: "MacroDefinition", typ
 @freestanding(declaration, names: arbitrary)
 macro declMacroWithControlFlow() = #externalMacro(module: "MacroDefinition", type: "DeclMacroWithControlFlow")
 
+// This needs to be matched up here due to the sorting of the SIL; just make
+// sure the counter '2' is for the initialization.
+// CHECK-LABEL: sil hidden [lazy_getter] [noinline] @$s15coverage_macros2S1V2z3SiSgvg : $@convention(method) (@inout S1) -> Optional<Int>
+// CHECK:       switch_enum {{%[0-9]+}} : $Optional<Optional<Int>>, case #Optional.some!enumelt: {{bb[0-9]}}, case #Optional.none!enumelt: [[INITBB:bb[0-9]]]
+// CHECK:       [[INITBB]]
+// CHECK-NEXT:  increment_profiler_counter 2
+
 // This needs to be matched up here due to the sorting of the SIL; just make
 // sure we emit the counter increments for the error branches.
 // CHECK-LABEL: sil hidden @$s15coverage_macros5test2Si_SityKF
@@ -56,9 +63,18 @@ struct S1 {
   // CHECK-LABEL: sil_coverage_map{{.*}}variable initialization expression of coverage_macros.S1.y
   var y: Int = 0
 
-  // FIXME: This shouldn't require parens
   // CHECK-LABEL: sil_coverage_map{{.*}}variable initialization expression of coverage_macros.S1.z
-  var z: Int = (#id(.random() ? 3 : 4)) // CHECK-NEXT: [[@LINE]]:16 -> [[@LINE]]:40 : 0
+  var z: Int = #id(.random() ? 3 : 4) // CHECK-NEXT: [[@LINE]]:16 -> [[@LINE]]:38 : 0
+
+  // CHECK-LABEL: sil_coverage_map{{.*}}variable initialization expression of coverage_macros.S1.z1
+  var z1: Int? = try? #id(throwingFn()) // CHECK-NEXT: [[@LINE]]:18 -> [[@LINE]]:40 : 0
+
+  // CHECK-LABEL: sil_coverage_map{{.*}}variable initialization expression of coverage_macros.S1.z2
+  var z2: Int? = #id(try? throwingFn()) // CHECK-NEXT: [[@LINE]]:18 -> [[@LINE]]:40 : 0
+
+  // The counter for the initialization region is '2', see the match of s15coverage_macros2S1V2z3SiSgvg above.
+  // CHECK-LABEL: sil_coverage_map{{.*}}coverage_macros.S1.z3.getter
+  lazy var z3: Int? = #id(try? throwingFn()) // CHECK-NEXT: [[@LINE]]:23 -> [[@LINE]]:45 : 2
 }
 
 @addMembers