Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Codegen: Query span as late as possible #78280

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Conversation

bugadani
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @eddyb

(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 Oct 23, 2020
if let Some(g) = self.get_declared_value(sym) {
if self.val_ty(g) != self.type_ptr_to(llty) {
span_bug!(span, "Conflicting types for static");
span_bug!(self.tcx.def_span(def_id), "Conflicting types for static");
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a reason you aren't using the Item span here? That seems easier to me

Copy link
Contributor Author

Choose a reason for hiding this comment

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

At the moment, it is, yes. Consider this change a step towards #43088 :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also I actually dont know, by the way, if these are identical, so it's kind of a "let's see what the tests think" kind of change.

Copy link
Contributor

@lcnr lcnr Oct 23, 2020

Choose a reason for hiding this comment

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

the tests won't think anything here will they? This is a span_bug so we should never reach this in tests

Copy link
Contributor Author

Choose a reason for hiding this comment

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

GitHub needs a reaction that indicates how blind I can be :)

@lcnr
Copy link
Contributor

lcnr commented Oct 23, 2020

r? @lcnr

@bors try @rust-timer queue

@rust-highfive rust-highfive assigned lcnr and unassigned eddyb Oct 23, 2020
@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@lcnr
Copy link
Contributor

lcnr commented Oct 23, 2020

@bors try

@bors
Copy link
Contributor

bors commented Oct 23, 2020

⌛ Trying commit ee0e694620a854aa79120797a51828808e09520a with merge ecfe4ae31e98013262cabb9089048076a74d3864...

@bors
Copy link
Contributor

bors commented Oct 23, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 23, 2020
@rust-log-analyzer
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bugadani
Copy link
Contributor Author

Hmm, can I?
@bors try

@bors
Copy link
Contributor

bors commented Oct 24, 2020

@bugadani: 🔑 Insufficient privileges: not in try users

@lcnr
Copy link
Contributor

lcnr commented Oct 24, 2020

@bors try

@bors
Copy link
Contributor

bors commented Oct 24, 2020

⌛ Trying commit c1b9d05991920c2b795c40ddb4afa030a760dbd0 with merge 3de59e1f390995a45756def4e7e157930d184b00...

@bors
Copy link
Contributor

bors commented Oct 24, 2020

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

@rust-timer
Copy link
Collaborator

Queued 3de59e1f390995a45756def4e7e157930d184b00 with parent 7bade6e, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (3de59e1f390995a45756def4e7e157930d184b00): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never

@lcnr
Copy link
Contributor

lcnr commented Oct 31, 2020

completely forgot about this PR, sry.

Afaict perf was slightly positive and it seems good to land, so

@bors r+

@bors
Copy link
Contributor

bors commented Oct 31, 2020

📌 Commit caf9131 has been approved by lcnr

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 31, 2020
@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 2, 2020
@pietroalbini
Copy link
Member

@bors retry

@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 Nov 2, 2020
@bors
Copy link
Contributor

bors commented Nov 2, 2020

⌛ Testing commit caf9131 with merge 53cc9ffee1ce28774351e040ee9338d677cc2ec7...

@bors
Copy link
Contributor

bors commented Nov 2, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 2, 2020
@bugadani
Copy link
Contributor Author

bugadani commented Nov 4, 2020

@pietroalbini could you please retry this again? The previous one looks like it failed with a network error:

warning: spurious network error (2 tries remaining): failed to get 200 response from `https://crates.io/api/v1/crates/matchers/0.0.1/download`, got 502
warning: spurious network error (1 tries remaining): failed to get 200 response from `https://crates.io/api/v1/crates/matchers/0.0.1/download`, got 502
error: failed to download from `https://crates.io/api/v1/crates/matchers/0.0.1/download`

@pietroalbini
Copy link
Member

@bors retry

@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 Nov 4, 2020
@bors
Copy link
Contributor

bors commented Nov 4, 2020

⌛ Testing commit caf9131 with merge 2f73a3e543c922ffcd80efb5375b9b711af47bb7...

@bors
Copy link
Contributor

bors commented Nov 4, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 4, 2020
@bugadani
Copy link
Contributor Author

bugadani commented Nov 4, 2020

I'm starting to think this PR is cursed :(

@pietroalbini
Copy link
Member

Congrats, you found a new kind of spurious failure!

@bors retry

@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 Nov 4, 2020
@bors
Copy link
Contributor

bors commented Nov 4, 2020

⌛ Testing commit caf9131 with merge 8963166...

@bors
Copy link
Contributor

bors commented Nov 4, 2020

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 8963166 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2020
@bors bors merged commit 8963166 into rust-lang:master Nov 4, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 4, 2020
@bugadani bugadani deleted the span branch November 4, 2020 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.