Merge commit 'b855ae990360' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit dff087fdb619 · 2023-10-03T15:58:38.000-07:00
diff --git a/clang/test/Modules/Inputs/System/usr/include/stdint.h b/clang/test/Modules/Inputs/System/usr/include/stdint.h
@@ -30,6 +30,7 @@ typedef unsigned int uintmax_t;
 
 // additional types for unwind.h
 
+typedef unsigned int uint32_t;
 typedef unsigned long long uint64_t;
 
 #endif /* STDINT_H */
