Merge pull request swiftlang#24628 from marcrasi/textowner-sized-deallocation

swift-ci · web-flow · commit ec71405dd858 · 2019-05-28T23:43:23.000-07:00
diff --git a/include/swift/Basic/OwnedString.h b/include/swift/Basic/OwnedString.h
@@ -46,6 +46,10 @@ class OwnedString {
       return new (data) TextOwner(Text);
     }
 
+    /// Disable sized deallocation for TextOwner, because it has tail-allocated
+    /// data.
+    void operator delete(void *p) { ::operator delete(p); }
+
     const char *getText() const { return getTrailingObjects<char>(); }
   };
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ class OwnedString {`
`46`	`46`	`return new (data) TextOwner(Text);`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ /// Disable sized deallocation for TextOwner, because it has tail-allocated`
	`50`	`+ /// data.`
	`51`	`+ void operator delete(void *p) { ::operator delete(p); }`
	`52`	`+`
`49`	`53`	`const char *getText() const { return getTrailingObjects<char>(); }`
`50`	`54`	`};`
`51`	`55`