Merge pull request #65754 from hyp/eng/5.9/c41774188cf345a645c81ab6270bc75bb5663a69

[5.9][interop][SwiftToCxx] add swift::String overlay constructor for const…

Author: hyp

lib/PrintAsClang/_SwiftStdlibCxxOverlay.h

@@ -35,6 +35,17 @@ SWIFT_INLINE_THUNK T_0_0 get() const
 
 #ifndef SWIFT_CXX_INTEROP_HIDE_STL_OVERLAY
 
+/// Constructs a Swift string from a C string.
+SWIFT_INLINE_THUNK String(const char *cString) noexcept {
+  if (!cString) {
+    auto res = _impl::$sS2SycfC();
+    memcpy(_getOpaquePointer(), &res, sizeof(res));
+    return;
+  }
+  auto res = _impl::$sSS7cStringSSSPys4Int8VG_tcfC(cString);
+  memcpy(_getOpaquePointer(), &res, sizeof(res));
+}
+
 /// Constructs a Swift string from a C++ string.
 SWIFT_INLINE_THUNK String(const std::string &str) noexcept {
   auto res = _impl::$sSS7cStringSSSPys4Int8VG_tcfC(str.c_str());

test/Interop/SwiftToCxx/stdlib/string/string-conversions.cpp

@@ -34,8 +34,17 @@ int main() {
   {
     auto s = String("hello world");
     printString(s);
+    swift::String s2 = "Hello literal";
+    printString(s2);
+    const char *literal = "Test literal via ptr";
+    printString(literal);
+    swift::String s3 = nullptr;
+    printString(s3);
   }
 // CHECK: '''hello world'''
+// CHECK-NEXT: '''Hello literal'''
+// CHECK-NEXT: '''Test literal via ptr'''
+// CHECK-NEXT: ''''''
 
   {
     std::string str = "test std::string";