Merge pull request #30260 from milseman/assert_san

rintaro · web-flow · commit 3f69d6b9ddb0 · 2020-03-06T09:32:31.000-08:00
[stdlib] Disable assertion tripping up ASAN
diff --git a/stdlib/public/core/StringStorage.swift b/stdlib/public/core/StringStorage.swift
@@ -485,8 +485,8 @@ extension __StringStorage {
 
     // Check that capacity end matches our notion of unused storage, and also
     // checks that breadcrumbs were dutifully aligned.
-    _internalInvariant(UnsafeMutablePointer<UInt8>(_realCapacityEnd)
-      == unusedStorage.baseAddress! + (unusedStorage.count + 1))
+    // _internalInvariant(UnsafeMutablePointer<UInt8>(_realCapacityEnd)
+    //   == unusedStorage.baseAddress! + (unusedStorage.count + 1))
   }
   #endif // INTERNAL_CHECKS_ENABLED
 }

Original file line number	Diff line number	Diff line change
`@@ -485,8 +485,8 @@ extension __StringStorage {`
`485`	`485`
`486`	`486`	`// Check that capacity end matches our notion of unused storage, and also`
`487`	`487`	`// checks that breadcrumbs were dutifully aligned.`
`488`		`- _internalInvariant(UnsafeMutablePointer<UInt8>(_realCapacityEnd)`
`489`		`- == unusedStorage.baseAddress! + (unusedStorage.count + 1))`
	`488`	`+ // _internalInvariant(UnsafeMutablePointer<UInt8>(_realCapacityEnd)`
	`489`	`+ // == unusedStorage.baseAddress! + (unusedStorage.count + 1))`
`490`	`490`	`}`
`491`	`491`	`#endif // INTERNAL_CHECKS_ENABLED`
`492`	`492`	`}`