Skip to content

Store macro parent module in ExpnData. #86694

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

Jump to bottom
Merged
merged 1 commit into from
Jul 6, 2021
Merged

Store macro parent module in ExpnData. #86694

merged 1 commit into from
Jul 6, 2021
+32 −40

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jun 28, 2021 •
edited
Loading

As a consequence, its value is hashed as part of the ExpnId's stable hash.

Closes #85999

@rust-highfive
Copy link
Contributor

r? @estebank

(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 Jun 28, 2021
@cjgillot
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 28, 2021
@bors
Copy link
Collaborator

bors commented Jun 28, 2021

⌛ Trying commit 93a50f291bb1e0942d684951672bf451577f208f with merge a8a5b6f5914a7a43dd3f42d6d4f8a3961e161893...

@rust-log-analyzer

This comment has been minimized.

# to view
@rust-log-analyzer

This comment has been minimized.

# to view
@bors

This comment has been minimized.

# to view
@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 Jun 28, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
@petrochenkov
Copy link
Contributor

r? @petrochenkov

@petrochenkov
Copy link
Contributor

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@bors
Copy link
Collaborator

bors commented Jun 28, 2021

⌛ Trying commit 8d223e5a345d39c775fba909b930a11fd2751a6a with merge 58d3ce9c965e1b5438465525123f03707a6e4774...

@petrochenkov petrochenkov removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 28, 2021
@bors
Copy link
Collaborator

bors commented Jun 28, 2021

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

@rust-timer
Copy link
Collaborator

Queued 58d3ce9c965e1b5438465525123f03707a6e4774 with parent a435b49, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (58d3ce9c965e1b5438465525123f03707a6e4774): comparison url.

Summary: This benchmark run did not return any significant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jun 29, 2021
petrochenkov
petrochenkov reviewed Jul 1, 2021
View reviewed changes
@cjgillot cjgillot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 5, 2021
@petrochenkov
Copy link
Contributor

r=me with commits squashed.

@petrochenkov petrochenkov 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 Jul 5, 2021
@cjgillot
Copy link
Contributor Author

cjgillot commented Jul 6, 2021

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Jul 6, 2021

📌 Commit 3162c37 has been approved by petrochenkov

@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 Jul 6, 2021
@bors
Copy link
Collaborator

bors commented Jul 6, 2021

⌛ Testing commit 3162c37 with merge ed6012bc2ccb807c06d6f2bf7b147aa190bb386c...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
source-code-page... ok
theme-change... ok
toggle-docs-mobile... ok
toggle-docs... ok
An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!


TROUBLESHOOTING: https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md
== STACKTRACE ==
Error
Error
    at innerRunTestCode (/node-v14.4.0-linux-x64/lib/node_modules/browser-ui-test/src/index.js:442:16)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)
    at async main (/checkout/src/tools/rustdoc-gui/tester.js:112:9)



command did not execute successfully: "/node-v14.4.0-linux-x64/bin/node" "/checkout/src/tools/rustdoc-gui/tester.js" "--doc-folder" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-gui" "--tests-folder" "/checkout/src/test/rustdoc-gui"


Build completed unsuccessfully in 0:00:37

@bors
Copy link
Collaborator

bors commented Jul 6, 2021

💔 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 Jul 6, 2021
@petrochenkov
Copy link
Contributor

@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 Jul 6, 2021
@bors
Copy link
Collaborator

bors commented Jul 6, 2021

⌛ Testing commit 3162c37 with merge d7901f3...

@bors
Copy link
Collaborator

bors commented Jul 6, 2021

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing d7901f3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2021
@bors bors merged commit d7901f3 into rust-lang:master Jul 6, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 6, 2021
This was referenced Jul 6, 2021
Merged
Merged
Merged
Merged
@cjgillot cjgillot deleted the pmmd branch July 6, 2021 17:09
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

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
Milestone
1.55.0
Development

Successfully merging this pull request may close these issues.

Turn parent_module_of_macro_def into a query
8 participants
@cjgillot @rust-highfive @rust-timer @bors @rust-log-analyzer @petrochenkov @estebank @rustbot