Skip to content

Remove is_dllimport_foreign_item definition from cg_ssa #80983

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 17, 2021

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jan 13, 2021

It overwrites the definition from rustc_metadata.

cc https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/query.20provided.20twice/near/218927806

Marked as draft to test if this breaks anything.

@bjorn3 bjorn3 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. A-codegen Area: Code generation T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 13, 2021
@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2021
@bjorn3 bjorn3 force-pushed the no_dup_is_dllimport_foreign_item branch from 1f16878 to c9fe728 Compare January 13, 2021 13:39
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bjorn3 bjorn3 force-pushed the no_dup_is_dllimport_foreign_item branch from 7113984 to 962cd06 Compare January 13, 2021 16:08
@bjorn3
Copy link
Member Author

bjorn3 commented Jan 13, 2021

@bors try

@bors
Copy link
Collaborator

bors commented Jan 13, 2021

⌛ Trying commit 962cd06f3de7506e1616a18b624356eca1fa29e1 with merge f26f361ab4403405a4cbadf03dc6d7cfe22e1081...

@bors
Copy link
Collaborator

bors commented Jan 13, 2021

☀️ Try build successful - checks-actions
Build commit: f26f361ab4403405a4cbadf03dc6d7cfe22e1081 (f26f361ab4403405a4cbadf03dc6d7cfe22e1081)

It overwrites the definition from rustc_metadata
@bjorn3 bjorn3 force-pushed the no_dup_is_dllimport_foreign_item branch from 962cd06 to 7aca2fa Compare January 13, 2021 17:47
@bjorn3 bjorn3 marked this pull request as ready for review January 13, 2021 17:47
@bjorn3
Copy link
Member Author

bjorn3 commented Jan 13, 2021

x86_64-pc-windows-msvc passed tests.

@nagisa
Copy link
Member

nagisa commented Jan 14, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 14, 2021

📌 Commit 7aca2fa has been approved by nagisa

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 14, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 17, 2021
…item, r=nagisa

Remove is_dllimport_foreign_item definition from cg_ssa

It overwrites the definition from rustc_metadata.

cc https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/query.20provided.20twice/near/218927806

Marked as draft to test if this breaks anything.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 17, 2021
Rollup of 13 pull requests

Successful merges:

 - rust-lang#79298 (correctly deal with late-bound lifetimes in anon consts)
 - rust-lang#80031 (resolve: Reject ambiguity built-in attr vs different built-in attr)
 - rust-lang#80201 (Add benchmark and fast path for BufReader::read_exact)
 - rust-lang#80635 (Improve diagnostics when closure doesn't meet trait bound)
 - rust-lang#80765 (resolve: Simplify collection of traits in scope)
 - rust-lang#80932 (Allow downloading LLVM on Windows and MacOS)
 - rust-lang#80983 (Remove is_dllimport_foreign_item definition from cg_ssa)
 - rust-lang#81064 (Support non-stage0 check)
 - rust-lang#81080 (Force vec![] to expression position only)
 - rust-lang#81082 (BTreeMap: clean up a few more comments)
 - rust-lang#81084 (Use Option::map instead of open-coding it)
 - rust-lang#81095 (Use Option::unwrap_or instead of open-coding it)
 - rust-lang#81107 (Add NonZeroUn::is_power_of_two)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8f2ee87 into rust-lang:master Jan 17, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 17, 2021
@bjorn3 bjorn3 deleted the no_dup_is_dllimport_foreign_item branch January 17, 2021 18:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-codegen Area: Code generation C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants