Merge pull request #76519 from allevato/various-fixes

allevato · web-flow · commit 9279ddfd1b69 · 2024-09-17T15:06:14.000-04:00
[NFC] Small cleanup in stdlib/public/runtime.
diff --git a/stdlib/public/runtime/Exception.cpp b/stdlib/public/runtime/Exception.cpp
@@ -31,7 +31,7 @@
 
 using namespace swift;
 
-extern "C" void __cxa_begin_catch(void *);
+extern "C" void *__cxa_begin_catch(void *);
 
 SWIFT_RUNTIME_STDLIB_API _Unwind_Reason_Code
 _swift_exceptionPersonality(int version,
diff --git a/stdlib/public/runtime/Leaks.mm b/stdlib/public/runtime/Leaks.mm
@@ -228,5 +228,5 @@ static void _swift_leaks_stopTrackingObjCObject(id Object) {
 }
 
 #else
-static char DummyDecl = '';
+static char DummyDecl = '\0';
 #endif

Original file line number	Diff line number	Diff line change
`@@ -228,5 +228,5 @@ static void _swift_leaks_stopTrackingObjCObject(id Object) {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`#else`
`231`		`-static char DummyDecl = '';`
	`231`	`+static char DummyDecl = '\0';`
`232`	`232`	`#endif`