[Profiler] Don't use presumed line numbers for profiling

rintaro · May 26, 2020 · 8b4d9ef · 8b4d9ef
1 parent 45bc578
commit 8b4d9ef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/SIL/IR/SILProfiler.cpp b/lib/SIL/IR/SILProfiler.cpp
@@ -884,8 +884,8 @@ struct CoverageMapping : public ASTWalker {
       assert(Region.hasStartLoc() && "invalid region");
       assert(Region.hasEndLoc() && "incomplete region");
 
-      auto Start = SM.getPresumedLineAndColumnForLoc(Region.getStartLoc());
-      auto End = SM.getPresumedLineAndColumnForLoc(Region.getEndLoc());
+      auto Start = SM.getLineAndColumnInBuffer(Region.getStartLoc());
+      auto End = SM.getLineAndColumnInBuffer(Region.getEndLoc());
       assert(Start.first <= End.first && "region start and end out of order");
 
       Regions.emplace_back(Start.first, Start.second, End.first, End.second,

diff --git a/test/Profiler/coverage_no_presumed_loc.swift b/test/Profiler/coverage_no_presumed_loc.swift
@@ -0,0 +1,14 @@
+// RUN: %target-swift-frontend -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_no_presumed_loc %s | %FileCheck %s
+
+func foo() {
+  var x : Int = 0
+
+// CHECK-LABEL: sil_coverage_map {{.*}}// foo()
+// CHECK: [[@LINE+3]]:10 -> [[@LINE+6]]:4
+// CHECK-NOT: 200:10 -> 100:4
+#sourceLocation(file: "foo.swift", line: 200)
+  repeat {
+    x += 1
+#sourceLocation(file: "bar.swift", line: 100)
+  } while x < 10
+}