Merge pull request #30163 from nkcsgexi/remove-assert-decl

nkcsgexi · web-flow · commit 407f2b4047fb · 2020-03-02T19:30:52.000-08:00
ABI checker: remove assert-only decls from the generated stdlib ABI baseline
diff --git a/test/api-digester/Outputs/stability-stdlib-abi.asserts.additional.swift.expected b/test/api-digester/Outputs/stability-stdlib-abi.asserts.additional.swift.expected
@@ -1 +1,7 @@
-
+Func _collectReferencesInsideObject(_:) is a new API without @available attribute
+Func _loadDestroyTLSCounter() is a new API without @available attribute
+Func _measureRuntimeFunctionCountersDiffs(objects:_:) is a new API without @available attribute
+Protocol _RuntimeFunctionCountersStats is a new API without @available attribute
+Struct _GlobalRuntimeFunctionCountersState is a new API without @available attribute
+Struct _ObjectRuntimeFunctionCountersState is a new API without @available attribute
+Struct _RuntimeFunctionCounters is a new API without @available attribute
diff --git a/test/api-digester/stability-stdlib-abi-without-asserts.swift b/test/api-digester/stability-stdlib-abi-without-asserts.swift
@@ -1,4 +1,3 @@
-// REQUIRES: rdar59812778
 // REQUIRES: OS=macosx
 // REQUIRES: swift_stdlib_no_asserts
 // RUN: %empty-directory(%t.tmp)
diff --git a/utils/api_checker/FrameworkABIBaseline/Swift/ABI/macos.json b/utils/api_checker/FrameworkABIBaseline/Swift/ABI/macos.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// REQUIRES: rdar59812778`
`2`	`1`	`// REQUIRES: OS=macosx`
`3`	`2`	`// REQUIRES: swift_stdlib_no_asserts`
`4`	`3`	`// RUN: %empty-directory(%t.tmp)`