Skip to content

Revert Clang types in SIL patch#29354

Merged
shahmishal merged 6 commits intoswiftlang:masterfrom
varungandhi-apple:vg-revert-clang-types-in-sil
Jan 22, 2020
Merged

Revert Clang types in SIL patch#29354
shahmishal merged 6 commits intoswiftlang:masterfrom
varungandhi-apple:vg-revert-clang-types-in-sil

Conversation

@varungandhi-apple
Copy link
Contributor

@varungandhi-apple varungandhi-apple commented Jan 22, 2020

Still keeping some printing changes so that LLDB doesn't break.

@varungandhi-apple
Copy link
Contributor Author

varungandhi-apple commented Jan 22, 2020

@swift-ci please smoke test

eeckstein
eeckstein approved these changes Jan 22, 2020
View reviewed changes
Copy link
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.

Thanks!

@varungandhi-apple
Copy link
Contributor Author

varungandhi-apple commented Jan 22, 2020 •
edited
Loading

Fixes rdar://problem/58791649.

@varungandhi-apple
Copy link
Contributor Author

varungandhi-apple commented Jan 22, 2020

There's a merge conflict because of #29351. It is just a documentation comment though. Let the Linux tests pass -> I'll fix the conflict -> @shahmishal can merge.

@varungandhi-apple
Revert "[Printer] Conditionally print Clang types in emitted SIL."
d9a7a7d 
This reverts commit a27c5f0.
@varungandhi-apple
Revert "[AST] Store Clang type in SILFunctionType for @convention(c) …
29cc1b6 
…functions."

This reverts commit 5f45820.
@varungandhi-apple
Revert "[AST] Add functionality for computing Clang types for SIL fun…
191b0d8 
…ctions."

This reverts commit bfa2f98.
@varungandhi-apple
Revert "[AST] Support SILFunctionType/SILBlockStorageType in ClangTyp…
3555289 
…eConverter."

This reverts commit feb76ea.
@varungandhi-apple
Revert "[NFC] Fix incorrect comment in ExtInfo's constructor."
ae35884 
This reverts commit f07ba79.
@varungandhi-apple
[Printer] Update printSIL to make sure LLDB doesn't break.
f6643af 
For more context, see:
1. #29239 - original PR which introduced
   the change, including an LLDB-side change.
2. The immediately preceding commit, which reverted this change.
3. #29350 which revealed some breakage
   caused by the changes in PR 29239 (unrelated to printing).
@shahmishal shahmishal merged commit a51f1e9 into swiftlang:master Jan 22, 2020
@varungandhi-apple varungandhi-apple mentioned this pull request Jan 22, 2020
Closed
@varungandhi-apple varungandhi-apple deleted the vg-revert-clang-types-in-sil branch January 22, 2020 17:40
@varungandhi-apple varungandhi-apple mentioned this pull request Feb 6, 2020
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eeckstein eeckstein eeckstein approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@varungandhi-apple @eeckstein @shahmishal