Skip to content

[cxx-interop][SwiftCompilerSources] Use swift::SourceLoc instead of BridgedSourceLoc#58699

Merged
egorzhdan merged 2 commits intomainfrom
egorzhdan/libswift-sourceloc
Jun 22, 2022
Merged

[cxx-interop][SwiftCompilerSources] Use swift::SourceLoc instead of BridgedSourceLoc#58699
egorzhdan merged 2 commits intomainfrom
egorzhdan/libswift-sourceloc

Conversation

@egorzhdan
Copy link
Copy Markdown
Contributor

@egorzhdan egorzhdan commented May 5, 2022

C++ interop is now enabled in SwiftCompilerSources, so we can remove some of the C bridging layer and use C++ classes directly from Swift.

rdar://83361087

@egorzhdan egorzhdan added the c++ interop Feature: Interoperability with C++ label May 5, 2022
@egorzhdan egorzhdan requested review from eeckstein and rintaro May 5, 2022 22:15
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented May 5, 2022

@swift-ci please smoke test

eeckstein
eeckstein approved these changes May 6, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@eeckstein eeckstein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@egorzhdan egorzhdan mentioned this pull request May 13, 2022
Merged
@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from 369fd61 to 6ce6537 Compare May 13, 2022 23:42
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented May 13, 2022

@swift-ci please smoke test

@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from 6ce6537 to af51419 Compare May 16, 2022 22:30
egorzhdan
egorzhdan commented May 16, 2022
View reviewed changes
SwiftCompilerSources/Package.swift
// Bridging modules and headers
"-Xcc", "-I", "-Xcc", "../include",
// LLVM modules and headers
"-Xcc", "-I", "-Xcc", "../../llvm-project/llvm/include",
Copy link
Copy Markdown
Contributor Author

@egorzhdan egorzhdan May 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also added the LLVM include paths to the SwiftPM manifest.

@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented May 16, 2022

@swift-ci please smoke test

zoecarver
zoecarver approved these changes May 17, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@zoecarver zoecarver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woohoo! This is awesome! 🥳

@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from af51419 to 41e6303 Compare June 8, 2022 12:14
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 8, 2022

(just rebased to prepare for landing)

@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 8, 2022

@swift-ci please smoke test

@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from 41e6303 to 6aef407 Compare June 8, 2022 12:56
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 8, 2022

@swift-ci please smoke test

@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from 6aef407 to 3ae3cc4 Compare June 8, 2022 16:17
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 8, 2022

@swift-ci please smoke test

@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 8, 2022

@swift-ci please smoke test macOS

@xedin
Copy link
Copy Markdown
Contributor

xedin commented Jun 8, 2022 •
edited
Loading

@egorzhdan This assert you see is an actual issue - name lookup finds __ObjC.(file).llvm.yaml.Hex8.__operatorEqualEqual : (llvm.yaml.Hex8) -> (llvm.yaml.Hex8) -> Bool while looking for == overloads and this overload is not marked to be an operator (the FuncDecl itself that is), so this is either a name lookup or importer problem.

@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 8, 2022

@xedin oh this is very interesting, thanks a lot for looking into it!
It seems the actual cause of the assertion is #58910 (cc @Huddie), I'll investigate.

@xedin
Copy link
Copy Markdown
Contributor

xedin commented Jun 8, 2022

No worries! If you need any help with Sema, let me know!

@egorzhdan egorzhdan mentioned this pull request Jun 9, 2022
Merged
@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from 3ae3cc4 to 18b8db4 Compare June 9, 2022 20:39
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 9, 2022

@swift-ci please smoke test

egorzhdan added 2 commits June 11, 2022 00:13
@egorzhdan
[cxx-interop][SwiftCompilerSources] Use swift::SourceLoc instead of…
038a4f0 
… `BridgedSourceLoc`

C++ interop is now enabled in SwiftCompilerSources, so we can remove some of the C bridging layer and use C++ classes directly from Swift.

rdar://83361087
@egorzhdan
[cxx-interop][SwiftCompilerSources] Add LLVM headers to the include p…
5768aeb 
…aths

This allows the Swift compiler to find headers like `llvm/Support/Compiler.h` that are used by Swift headers.
@egorzhdan egorzhdan force-pushed the egorzhdan/libswift-sourceloc branch from 18b8db4 to 5768aeb Compare June 10, 2022 23:13
@egorzhdan
Copy link
Copy Markdown
Contributor Author

egorzhdan commented Jun 10, 2022

@swift-ci please smoke test

@egorzhdan egorzhdan merged commit b8e2f2e into main Jun 22, 2022
@egorzhdan egorzhdan deleted the egorzhdan/libswift-sourceloc branch June 22, 2022 09:55
@finagolfin finagolfin mentioned this pull request Jul 28, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zoecarver zoecarver zoecarver approved these changes

@eeckstein eeckstein eeckstein approved these changes

@rintaro rintaro Awaiting requested review from rintaro

Assignees

No one assigned

Labels

c++ interop Feature: Interoperability with C++

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@egorzhdan @xedin @zoecarver @eeckstein