Merge pull request #30039 from vedantk/master

Author: swift-ci

lib/SIL/SILProfiler.cpp

@@ -1076,10 +1076,14 @@ struct CoverageMapping : public ASTWalker {
       pushRegion(E);
     }
 
-    if (auto *IE = dyn_cast<IfExpr>(E)) {
-      CounterExpr &ThenCounter = assignCounter(IE->getThenExpr());
-      assignCounter(IE->getElseExpr(),
-                    CounterExpr::Sub(getCurrentCounter(), ThenCounter));
+    // If there isn't an active region, we may be visiting a default
+    // initializer for a function argument.
+    if (!RegionStack.empty()) {
+      if (auto *IE = dyn_cast<IfExpr>(E)) {
+        CounterExpr &ThenCounter = assignCounter(IE->getThenExpr());
+        assignCounter(IE->getElseExpr(),
+                      CounterExpr::Sub(getCurrentCounter(), ThenCounter));
+      }
     }
 
     if (hasCounter(E) && !Parent.isNull())

test/Profiler/coverage_arg_ternary.swift

@@ -0,0 +1,8 @@
+// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_arg_ternary %s | %FileCheck %s
+
+var s: String?
+
+// CHECK: sil_coverage_map {{.*}} "$s20coverage_arg_ternary1f0B0ySSSg_tF"
+// CHECK-NEXT:  [[@LINE+2]]:43 -> [[@LINE+2]]:45 : 0
+// CHECK-NEXT: }
+func f(arg: String? = s != nil ? s : nil) {}