Merge pull request #60331 from hyp/eng/i/shimsInt

[interop][SwiftToCxx] NFC, move swift::Int&UInt declarations into shi…

Author: hyp

lib/PrintAsClang/PrintAsClang.cpp

@@ -337,15 +337,6 @@ static void writePrologue(raw_ostream &out, ASTContext &ctx,
   emitCxxConditional(
       out, [&] { emitMacro("SWIFT_NOEXCEPT", "noexcept"); },
       [&] { emitMacro("SWIFT_NOEXCEPT"); });
-  emitCxxConditional(out, [&] {
-    out << "#if !defined(SWIFT_CXX_INT_DEFINED)\n";
-    out << "#define SWIFT_CXX_INT_DEFINED\n";
-    out << "namespace swift {\n";
-    out << "using Int = ptrdiff_t;\n";
-    out << "using UInt = size_t;\n";
-    out << "}\n";
-    out << "#endif\n";
-  });
   static_assert(SWIFT_MAX_IMPORTED_SIMD_ELEMENTS == 4,
               "need to add SIMD typedefs here if max elements is increased");
 }

stdlib/public/SwiftShims/_SwiftCxxInteroperability.h

@@ -51,6 +51,12 @@ inline void opaqueFree(void *_Nonnull p) noexcept {
 
 } // namespace _impl
 
+/// Swift's Int type.
+using Int = ptrdiff_t;
+
+/// Swift's UInt type.
+using UInt = size_t;
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wc++17-extensions"