Merge pull request swiftlang#31824 from gottesmm/pr-3475f9a686612f497f7c626b14c287cd5d28013c

swift-ci · web-flow · commit 1c5a4a840f80 · 2020-05-15T15:04:22.000-07:00
diff --git a/test/IRGen/access_markers.sil b/test/IRGen/access_markers.sil
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -swift-version 4 -enforce-exclusivity=checked %s -emit-ir | %FileCheck %s --check-prefix=CHECK
 
+sil_stage canonical
+
 import Builtin
 import Swift
 
diff --git a/test/Profiler/coverage_invalid_loc.swift b/test/Profiler/coverage_invalid_loc.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -disable-sil-ownership-verifier -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_invalid_loc %s | %FileCheck %s
+// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_invalid_loc %s | %FileCheck %s
 // RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -emit-ir %s
 
 // The implicit tuple and array exprs formed to call `dynamicallyCall`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -disable-sil-ownership-verifier -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_invalid_loc %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_invalid_loc %s \| %FileCheck %s`
`2`	`2`	`// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -emit-ir %s`
`3`	`3`
`4`	`4`	// The implicit tuple and array exprs formed to call `dynamicallyCall`