Merge pull request #35399 from brentdax/free-as-a-null/main

beccadax · web-flow · commit 377a2253b82a · 2021-01-13T16:51:55.000-08:00
[NFC-ish] Correct nullability of free() redeclaration
diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h
@@ -43,7 +43,7 @@ __swift_size_t _swift_stdlib_fwrite_stdout(const void *ptr, __swift_size_t size,
 // General utilities <stdlib.h>
 // Memory management functions
 static inline void _swift_stdlib_free(void *_Nullable ptr) {
-  extern void free(void *);
+  extern void free(void *_Nullable);
   free(ptr);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ __swift_size_t _swift_stdlib_fwrite_stdout(const void *ptr, __swift_size_t size,`
`43`	`43`	`// General utilities <stdlib.h>`
`44`	`44`	`// Memory management functions`
`45`	`45`	`static inline void _swift_stdlib_free(void *_Nullable ptr) {`
`46`		`- extern void free(void *);`
	`46`	`+ extern void free(void *_Nullable);`
`47`	`47`	`free(ptr);`
`48`	`48`	`}`
`49`	`49`