Skip to content

Re-land parsing and printing for Clang function types.#29049

Merged
varungandhi-apple merged 1 commit into
swiftlang:masterfrom
varungandhi-apple:vg-v4-clang-types-in-swiftinterface
Jan 8, 2020
Merged

Re-land parsing and printing for Clang function types.#29049
varungandhi-apple merged 1 commit into
swiftlang:masterfrom
varungandhi-apple:vg-v4-clang-types-in-swiftinterface

Conversation

@varungandhi-apple
Copy link
Copy Markdown
Contributor

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

This reverts commit e805fe4, which reverted
the change earlier. The problem was caused due to a simultaneous change to some
code by the PR with parsing and printing for Clang function types (#28737)
and the PR which introduced Located (#28643).

This commit also includes 2 small changes:

  1. Make sure the intersecting region
    is fixed: the change is limited to using the fields of Located in the
    tryParseClangType lambda.
  2. The test full-convention.swift has been updated to use Int32 instead of Int to avoid differences between platforms (Int translates to long on Linux/macOS but long long on Windows).

@varungandhi-apple
Copy link
Copy Markdown
Contributor Author

@swift-ci please test

@varungandhi-apple
Copy link
Copy Markdown
Contributor Author

cc @compnerd

@compnerd
Copy link
Copy Markdown
Member

compnerd commented Jan 7, 2020

@swift-ci please test Windows platform

@varungandhi-apple

This comment has been minimized.

@varungandhi-apple

This comment has been minimized.

@varungandhi-apple

This comment has been minimized.

@swift-ci

This comment has been minimized.

@swift-ci

This comment has been minimized.

This reverts commit e805fe4, which reverted
the change earlier. The problem was caused due to a simultaneous change to some
code by the PR with parsing and printing for Clang function types (#28737)
and the PR which introduced Located<T> (#28643).

This commit also includes a small change to make sure the intersecting region
is fixed: the change is limited to using the fields of Located<T> in the
`tryParseClangType` lambda.
@varungandhi-apple
Copy link
Copy Markdown
Contributor Author

@swift-ci please test Windows platform

@varungandhi-apple
Copy link
Copy Markdown
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Copy Markdown
Contributor

swift-ci commented Jan 8, 2020

Build failed
Swift Test OS X Platform
Git Sha - 7ece836cddd6029ddec9d6a545879f0045133689

@swift-ci
Copy link
Copy Markdown
Contributor

swift-ci commented Jan 8, 2020

Build failed
Swift Test Linux Platform
Git Sha - 7ece836cddd6029ddec9d6a545879f0045133689

@varungandhi-apple
Copy link
Copy Markdown
Contributor Author

@swift-ci please test Windows platform

1 similar comment
@varungandhi-apple
Copy link
Copy Markdown
Contributor Author

@swift-ci please test Windows platform

@varungandhi-apple varungandhi-apple merged commit d919bfa into swiftlang:master Jan 8, 2020
@varungandhi-apple varungandhi-apple deleted the vg-v4-clang-types-in-swiftinterface branch January 8, 2020 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants