Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

stdlib/public/SwiftShims/LibcShims.h

@@ -213,7 +213,11 @@ float _swift_stdlib_log1pf(float x) {
 
 static inline SWIFT_ALWAYS_INLINE
 float _swift_stdlib_hypotf(float x, float y) {
+#if defined(_WIN32)
+  return _hypotf(x, y);
+#else
   return __builtin_hypotf(x, y);
+#endif
 }
 
 static inline SWIFT_ALWAYS_INLINE