🍒[6.0][cxx-interop] Fix reverse interop crash when using raw modules

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -286,11 +286,10 @@ class ModuleWriter {
     if (!isa<clang::TypeDecl>(typeDecl->getClangDecl()))
       return;
     // Get the underlying clang type from a type alias decl or record decl.
-    auto clangType =
-        clang::QualType(
-            cast<clang::TypeDecl>(typeDecl->getClangDecl())->getTypeForDecl(),
-            0)
-            .getCanonicalType();
+    auto clangDecl = typeDecl->getClangDecl();
+    auto clangType = clangDecl->getASTContext()
+                         .getTypeDeclType(cast<clang::TypeDecl>(clangDecl))
+                         .getCanonicalType();
     if (!isa<clang::RecordType>(clangType.getTypePtr()))
       return;
     auto it = seenClangTypes.insert(clangType.getTypePtr());

test/Interop/CxxToSwiftToCxx/span/span-execution.cpp

@@ -0,0 +1,119 @@
+// RUN: %empty-directory(%t)
+// RUN: split-file %s %t
+
+// RUN: %target-swift-frontend -typecheck %t/use-span.swift -typecheck -module-name UseSpan -emit-clang-header-path %t/UseSpan.h -I %t -enable-experimental-cxx-interop -Xcc -Xclang -Xcc -fmodule-format=raw -Xcc -std=c++20 -clang-header-expose-decls=all-public
+
+// RUN: %target-interop-build-clangxx -std=c++20 -c %t/use-span.cpp -I %t -o %t/swift-cxx-execution.o
+// RUN: %target-interop-build-swift %t/use-span.swift -o %t/swift-cxx-execution -Xlinker %t/swift-cxx-execution.o -module-name UseSpan -Xfrontend -entry-point-function-name -Xfrontend swiftMain -I %t -O -Xcc --std=c++20
+
+// RUN: %target-codesign %t/swift-cxx-execution
+// RUN: %target-run %t/swift-cxx-execution | %FileCheck %s
+
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu
+
+// REQUIRES: executable_test
+
+//--- header.h
+#include <string>
+#include <span>
+
+using Span = std::span<int>;
+using SpanOfString = std::span<std::string>;
+
+namespace ns {
+  using SpanOfConstUInt8 = std::span<const uint8_t>;
+}
+
+static int staticArr[] = {1, 2, 3};
+static Span staticSpan = {staticArr};
+
+//--- module.modulemap
+module CxxTest {
+  header "header.h"
+  requires cplusplus
+  export *
+}
+
+//--- use-span.swift
+import CxxTest
+
+public func createEmptySpan() -> Span {
+  return Span()
+}
+
+public func printSpan() {
+  print("{\(staticSpan[0]), \(staticSpan[1]), \(staticSpan[2])}")
+}
+
+public func printSpan(_ sp: Span) {
+  print("{\(sp[0]), \(sp[1]), \(sp[2])}")
+}
+
+public func printSpanOfString(_ sp: SpanOfString) {
+  print("{\(sp[0]), \(sp[1]), \(sp[2])}")
+}
+
+public func passthroughSpan(_ sp: Span) -> Span {
+  return sp;
+}
+
+public func changeSpan(_ sp: inout Span) {
+  sp[0] = 0;
+}
+
+public func mapSpan(_ sp: Span) {
+  let result = sp.map { $0 + 3 }
+  print(result)
+}
+
+public typealias SpanConstUInt8 = ns.SpanOfConstUInt8
+
+public func receiveSpanAlias(_ sp1: SpanConstUInt8, _ sp2: SpanConstUInt8) {
+}
+
+//--- use-span.cpp
+#include <cassert>
+#include "header.h"
+#include "UseSpan.h"
+
+
+int main() {
+  using namespace swift;  
+  {
+    Span emptySpan = UseSpan::createEmptySpan();
+    assert(emptySpan.empty());
+    assert(emptySpan.size() == 0);
+
+    int arr[] = {4, 5, 6};
+    Span sp = {arr};
+    UseSpan::printSpan();
+    UseSpan::printSpan(sp);
+    assert(staticSpan[0] == 1);
+    assert(sp[0] == 4);
+  }
+  // CHECK: {1, 2, 3}
+  // CHECK-NEXT: {4, 5, 6}
+  {
+    std::string strArr[] = {"", "a", "abc"};
+    SpanOfString strSp = {strArr};
+    UseSpan::printSpanOfString(strSp);
+  }
+  // CHECK-NEXT: {, a, abc}
+  { 
+    int arr[] = {4, 5, 6};
+    Span sp = {arr};
+    UseSpan::printSpan(UseSpan::passthroughSpan(sp));
+    UseSpan::changeSpan(sp);
+    UseSpan::printSpan(sp);
+  }
+  // CHECK-NEXT: {4, 5, 6}
+  // CHECK-NEXT: {0, 5, 6}
+  {
+    int arr[] = {4, 5, 6};
+    Span sp = {arr};
+    UseSpan::mapSpan(sp);
+  }
+  // CHECK-NEXT: [7, 8, 9] 
+  return 0;
+}