Fix assertions: don't invariantCheck() until code units are initialized

milseman · milseman · commit 0fc297e82bbb · 2018-10-15T15:32:36.000-07:00
diff --git a/stdlib/public/core/StringStorage.swift b/stdlib/public/core/StringStorage.swift
@@ -186,7 +186,9 @@ extension _StringStorage {
 
     storage._breadcrumbsAddress.initialize(to: nil)
     storage.terminator.pointee = 0 // nul-terminated
-    storage._invariantCheck()
+
+    // NOTE: We can't _invariantCheck() now, because code units have not been
+    // initialized. But, _StringGuts's initializer will.
     return storage
   }
 

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,9 @@ extension _StringStorage {`
`186`	`186`
`187`	`187`	`storage._breadcrumbsAddress.initialize(to: nil)`
`188`	`188`	`storage.terminator.pointee = 0 // nul-terminated`
`189`		`- storage._invariantCheck()`
	`189`	`+`
	`190`	`+ // NOTE: We can't _invariantCheck() now, because code units have not been`
	`191`	`+ // initialized. But, _StringGuts's initializer will.`
`190`	`192`	`return storage`
`191`	`193`	`}`
`192`	`194`