Merge pull request #65497 from hyp/eng/reverse-interop-5.9-assert-var-fn-name

[5.9][interop][SwiftToCxx] do not assert when emitting a public var and fu…

Author: hyp

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -669,6 +669,13 @@ class ModuleWriter {
       // Two overloaded functions can have the same name when emitting C++.
       if (isa<AbstractFunctionDecl>(*rhs) && isa<AbstractFunctionDecl>(*lhs))
         return result;
+      // A function and a global variable can have the same name in C++,
+      // even when the variable might not actually be emitted by the emitter.
+      // In that case, order the function before the variable.
+      if (isa<AbstractFunctionDecl>(*rhs) && isa<VarDecl>(*lhs))
+        return 1;
+      if (isa<AbstractFunctionDecl>(*lhs) && isa<VarDecl>(*rhs))
+        return -1;
 
       // Prefer value decls to extensions.
       assert(!(isa<ValueDecl>(*lhs) && isa<ValueDecl>(*rhs)));

test/Interop/SwiftToCxx/functions/swift-functions.swift

@@ -48,3 +48,8 @@ public func passVoidReturnVoid() { print("passVoidReturnVoid") }
 // CHECK: SWIFT_INLINE_THUNK void passVoidReturnVoid() noexcept SWIFT_SYMBOL("s:9Functions014passVoidReturnC0yyF") {
 // CHECK: return _impl::$s9Functions014passVoidReturnC0yyF();
 // CHECK: }
+
+// CHECK: SWIFT_INLINE_THUNK void varFunctionSameName
+public func varFunctionSameName(_ x: CInt) {}
+
+public var varFunctionSameName: CInt = 0