[cxx-interop] Revert changes to template argument import/safety check #85296

j-hui · 2025-11-03T22:40:28Z

Reverts #85177, #85176, #85095 and #84866. These patches are causing circular request issues on Linux and FreeBSD that need more investigation.

rdar://163940680

This reverts commit c005445.

This reverts commit d0bad4c.

This reverts commit c672e27.

This reverts commit 929d0d8.

…icitSafety" This reverts commit d2632d2.

j-hui · 2025-11-03T22:40:43Z

@swift-ci please smoke test

…tyDescriptor" This reverts commit 5328572.

… as unsafe" This reverts commit afaa499.

This reverts commit d5473fe.

j-hui · 2025-11-04T02:04:30Z

@swift-ci please smoke test

kavon · 2025-11-04T16:54:35Z

lib/SILGen/CMakeFiles/swiftSILGen.dir/SILGenDestructor.cpp.o -MF lib/SILGen/CMakeFiles/swiftSILGen.dir/SILGenDestructor.cpp.o.d -o lib/SILGen/CMakeFiles/swiftSILGen.dir/SILGenDestructor.cpp.o -c /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/swift/lib/SILGen/SILGenDestructor.cpp
18:46:59 
 /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/swift/lib/SILGen/SILGenDestructor.cpp:61:11: error: unused variable 'C' [-Werror,-Wunused-variable]
18:46:59     61 |     auto &C = cd->getASTContext();
18:46:59        |           ^
18:46:59  1 error generated.

kavon · 2025-11-04T17:36:02Z

@swift-ci smoke test macOS

kavon · 2025-11-04T17:36:36Z

The unused variable thing was unrelated to this PR and has been fixed on main

kavon · 2025-11-04T22:17:59Z

ASTGen/decls.swift failing with:

11:14:32  Assertion failed: ((Args.size() == FTy->getNumParams() || (FTy->isVarArg() && Args.size() > FTy->getNumParams())) && "Calling a function with bad signature!"), function init, file Instructions.cpp, line 756.
11:14:32  Please submit a bug report (https://swift.org/contributing/#reporting-bugs) and include the crash backtrace.
11:14:32  Stack dump:
11:14:32  0.	Program arguments: /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swift-macosx-x86_64/bin/swift-frontend -frontend -c -primary-file /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/swift/test/ASTGen/decls.swift -target x86_64-apple-macosx13.0 -enable-objc-interop -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk -F /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks -F /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swift-macosx-x86_64/lib -enable-experimental-feature CoroutineAccessors -enable-experimental-feature DefaultIsolationPerFile -enable-experimental-feature ParserASTGen -module-cache-path /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swift-macosx-x86_64/swift-test-results/x86_64-apple-macosx13.0/clang-module-cache -swift-version 4 -define-availability "SwiftStdlib 9999:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999" -define-availability "StdlibDeploymentTarget 9999:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999" -define-availability "SwiftStdlib 5.0:macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2" -define-availability "StdlibDeploymentTarget 5.0:macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2" -define-availability "SwiftStdlib 5.1:macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0" -define-availability "StdlibDeploymentTarget 5.1:macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0" -define-availability "SwiftStdlib 5.2:macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4" -define-availability "StdlibDeploymentTarget 5.2:macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4" -define-availability "SwiftStdlib 5.3:macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0" -define-availability "StdlibDeploymentTarget 5.3:macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0" -define-availability "SwiftStdlib 5.4:macOS 11.3, iOS 14.5, watchOS 7.4, tvOS 14.5" -define-availability "StdlibDeploymentTarget 5.4:macOS 11.3, iOS 14.5, watchOS 7.4, tvOS 14.5" -define-availability "SwiftStdlib 5.5:macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0" -define-availability "StdlibDeploymentTarget 5.5:macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0" -define-availability "SwiftStdlib 5.6:macOS 12.3, iOS 15.4, watchOS 8.5, tvOS 15.4" -define-availability "StdlibDeploymentTarget 5.6:macOS 12.3, iOS 15.4, watchOS 8.5, tvOS 15.4" -define-availability "SwiftStdlib 5.7:macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0" -define-availability "StdlibDeploymentTarget 5.7:macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0" -define-availability "SwiftStdlib 5.8:macOS 13.3, iOS 16.4, watchOS 9.4, tvOS 16.4" -define-availability "StdlibDeploymentTarget 5.8:macOS 13.0" -define-availability "SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0" -define-availability "StdlibDeploymentTarget 5.9:macOS 13.0" -define-availability "SwiftStdlib 5.10:macOS 14.4, iOS 17.4, watchOS 10.4, tvOS 17.4, visionOS 1.1" -define-availability "StdlibDeploymentTarget 5.10:macOS 13.0" -define-availability "SwiftStdlib 6.0:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0" -define-availability "StdlibDeploymentTarget 6.0:macOS 13.0" -define-availability "SwiftStdlib 6.1:macOS 15.4, iOS 18.4, watchOS 11.4, tvOS 18.4, visionOS 2.4" -define-availability "StdlibDeploymentTarget 6.1:macOS 13.0" -define-availability "SwiftStdlib 6.2:macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0" -define-availability "StdlibDeploymentTarget 6.2:macOS 13.0" -define-availability "SwiftStdlib 6.3:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999" -define-availability "StdlibDeploymentTarget 6.3:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999" -define-availability "SwiftCompatibilitySpan 5.0:macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, visionOS 1.0" -define-availability "SwiftCompatibilitySpan 6.2:macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0" -disable-availability-checking -enable-experimental-concurrency -external-plugin-path /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk/usr/lib/swift/host/plugins#/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk/usr/bin/swift-plugin-server -external-plugin-path /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk/usr/local/lib/swift/host/plugins#/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk/usr/bin/swift-plugin-server -external-plugin-path /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/usr/lib/swift/host/plugins#/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/usr/bin/swift-plugin-server -external-plugin-path /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/usr/local/lib/swift/host/plugins#/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/usr/bin/swift-plugin-server -in-process-plugin-server-path /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swift-macosx-x86_64/lib/swift/host/libSwiftInProcPluginServer.dylib -plugin-path /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swift-macosx-x86_64/lib/swift/host/plugins -plugin-path /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swift-macosx-x86_64/local/lib/swift/host/plugins -target-sdk-version 15.2 -dwarf-version=4 -module-name main -o /var/folders/bb/hcrjxg1s0b96pfst0ymhmp240000gn/T/lit-tmp-c3tb5z7m/decls-d1b732.o
11:14:32  1.	Apple Swift version 6.3-dev (LLVM 8d8048da17dc0a2, Swift 7974854acd675ab)
11:14:32  2.	Compiling with effective version 4.1.50
11:14:32  3.	While evaluating request IRGenRequest(IR Generation for file "/Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/swift/test/ASTGen/decls.swift")
11:14:32  4.	While emitting IR SIL function "@$s4main8testVarsyyF1tL_Sivy".
11:14:32   for read2 for t (at /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/swift/test/ASTGen/decls.swift:121:7)
11:14:32  <unknown>:0: error: unable to execute command: Abort trap: 6
11:14:32  <unknown>:0: error: compile command failed due to signal 6 (use -v to see invocation)

kavon · 2025-11-04T22:18:20Z

@swift-ci smoke test macOS

j-hui added 5 commits November 3, 2025 14:36

Reapply "[Test][C++ Interop] XFAIL some tests."

e9943bc

This reverts commit c005445.

Revert "[cxx-interop] Avoid cycles in ClangTypeExplicitSafety requests"

80fa8c1

This reverts commit d0bad4c.

Revert "[Test][C++ Interop] XFAIL some tests."

f98480f

This reverts commit c672e27.

Revert "[cxx-interop] Avoid cycles in ClangDeclExplicitSafety requests"

a13c95d

This reverts commit 929d0d8.

Revert "[cxx-interop] Check template argument safety in ClangDeclExpl…

6607ae9

…icitSafety" This reverts commit d2632d2.

j-hui requested review from Xazax-hun, beccadax, egorzhdan, hnrklssn, ian-twilightcoder and susmonteiro as code owners November 3, 2025 22:40

kavon enabled auto-merge November 4, 2025 01:05

kavon self-requested a review November 4, 2025 01:05

kavon approved these changes Nov 4, 2025

View reviewed changes

j-hui added 3 commits November 3, 2025 17:58

Revert "[cxx-interop] Use clang::CanQualType in ClangTypeExplicitSafe…

ad8b5a5

…tyDescriptor" This reverts commit 5328572.

Revert "[cxx-interop] Mark class templates with unsafe type arguments…

4389cc9

… as unsafe" This reverts commit afaa499.

Revert "[cxx-interop] Do not import template type arguments"

ae93474

This reverts commit d5473fe.

kavon merged commit 758e67f into swiftlang:main Nov 5, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[cxx-interop] Revert changes to template argument import/safety check #85296

[cxx-interop] Revert changes to template argument import/safety check #85296

j-hui commented Nov 3, 2025 •

edited

Loading

Uh oh!

j-hui commented Nov 3, 2025

Uh oh!

j-hui commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[cxx-interop] Revert changes to template argument import/safety check #85296

[cxx-interop] Revert changes to template argument import/safety check #85296

Conversation

j-hui commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

j-hui commented Nov 3, 2025

Uh oh!

j-hui commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

kavon commented Nov 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

j-hui commented Nov 3, 2025 •

edited

Loading