Skip to content

Don't access a static just for its size and alignment - #62982

Merged
bors merged 7 commits into
rust-lang:masterfrom
oli-obk:static_cycle
Jul 27, 2019
Merged

Don't access a static just for its size and alignment#62982
bors merged 7 commits into
rust-lang:masterfrom
oli-obk:static_cycle

Conversation

@oli-obk

@oli-obkoli-obk commented Jul 25, 2019

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Jul 25, 2019

Copy link
Copy Markdown
Contributor

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 25, 2019
@oli-obkoli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 25, 2019
RalfJung
RalfJung reviewed Jul 25, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/memory.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/memory.rs Outdated
@RalfJung

RalfJung commented Jul 26, 2019

Copy link
Copy Markdown
Member

r? @RalfJung

RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/memory.rs
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/memory.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/memory.rs
RalfJung
RalfJung approved these changes Jul 26, 2019
View reviewed changes

@RalfJungRalfJung left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

r=me with these nits fixed and CI green

Comment threadsrc/librustc_mir/interpret/memory.rs Outdated
Comment threadsrc/librustc_mir/interpret/memory.rs Outdated
oli-obkand others added 2 commits July 26, 2019 17:43
@oli-obk@RalfJung
Update src/librustc_mir/interpret/memory.rs
6e04ca7
Co-Authored-By: Ralf Jung <post@ralfj.de>
@oli-obk@RalfJung
Update src/librustc_mir/interpret/memory.rs
0cd7167
Co-Authored-By: Ralf Jung <post@ralfj.de>
@RalfJung

RalfJung commented Jul 27, 2019

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jul 27, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0cd7167 has been approved by RalfJung

@borsbors 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 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 27, 2019
@Centril
Rollup merge ofrust-lang#62982- oli-obk:static_cycle, r=RalfJung
b25d74f
Don't access a static just for its size and alignment
cc @RalfJungfixesrust-lang#62189
@CentrilCentril mentioned this pull request Jul 27, 2019
Merged
bors added a commit that referenced this pull request Jul 27, 2019
@bors
Auto merge of#63043- Centril:rollup-f4baee4, r=Centril
a5e7bb3
Rollup of 6 pull requests
Successful merges:
- #62423 (Fix cycle error with existential types)
- #62979 (Cleanup save-analysis JsonDumper)
- #62982 (Don't access a static just for its size and alignment)
- #63013 (add `repr(transparent)` to `IoSliceMut` where missing)
- #63014 (Stop bare trait lint applying to macro call sites)
- #63036 (Add lib section to rustc_lexer's Cargo.toml)
Failed merges:
r? @ghost
@RalfJungRalfJung mentioned this pull request Jul 28, 2019
Merged
RalfJung
RalfJung reviewed Jul 28, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/memory.rs
return Ok((Size::from_bytes(alloc.bytes.len() as u64), alloc.align));
}
// Function pointers.
if let Ok(_) = self.get_fn_alloc(id) {

@RalfJungRalfJungJul 28, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, this is the bug that I missed. We no longer check the "machine" function pointers.

@RalfJungRalfJung mentioned this pull request Jul 28, 2019
Merged
Centril added a commit to Centril/rust that referenced this pull request Jul 29, 2019
@Centril
Rollup merge ofrust-lang#63076- RalfJung:miri-fn-ptr-alloc-size, r=…
5922a19
…oli-obk
Miri: fix determining size of an "extra function" allocation
Fixes [a bug](rust-lang/miri#862) introduced by rust-lang#62982. Best reviewed commit-by-commit.
r? @oli-obk
@emilyalbiniemilyalbini added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 3, 2019
@nagisanagisa added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 8, 2019
@emilyalbiniemilyalbini added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. and removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Aug 12, 2019
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Aug 12, 2019
Merged
bors added a commit that referenced this pull request Aug 13, 2019
@bors
Auto merge of#63498- Mark-Simulacrum:stable-next, r=Mark-Simulacrum
2fa8790
1.37.0 stable
This promotes beta to stable and backports a few PRs:
- Avoid ICE when referencing desugared local binding in borrow error (#63051)
- Don't access a static just for its size and alignment (#62982) via 331e09b143aebfcf82dc1f9b69b31ee0083cbf0b
bors added a commit that referenced this pull request Aug 13, 2019
@bors
Auto merge of#63498- Mark-Simulacrum:stable-next, r=Mark-Simulacrum
eae3437
1.37.0 stable
This promotes beta to stable and backports a few PRs:
- Avoid ICE when referencing desugared local binding in borrow error (#63051)
- Don't access a static just for its size and alignment (#62982) via 331e09b143aebfcf82dc1f9b69b31ee0083cbf0b
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge ofrust-lang#63075- RalfJung:deref-checks, r=oli-obk
2697a29
Miri: Check that a ptr is aligned and inbounds already when evaluating `*`
This syncs Miri with what the Nomicon and the Reference say, and resolvesrust-lang/miri#447.
Also this would not have worked without rust-lang#62982 due to new cycles. ;)
r? @oli-obk
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge ofrust-lang#63075- RalfJung:deref-checks, r=oli-obk
8d6c4b5
Miri: Check that a ptr is aligned and inbounds already when evaluating `*`
This syncs Miri with what the Nomicon and the Reference say, and resolvesrust-lang/miri#447.
Also this would not have worked without rust-lang#62982 due to new cycles. ;)
r? @oli-obk
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge ofrust-lang#63075- RalfJung:deref-checks, r=oli-obk
34dea10
Miri: Check that a ptr is aligned and inbounds already when evaluating `*`
This syncs Miri with what the Nomicon and the Reference say, and resolvesrust-lang/miri#447.
Also this would not have worked without rust-lang#62982 due to new cycles. ;)
r? @oli-obk
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge ofrust-lang#63075- RalfJung:deref-checks, r=oli-obk
95894cb
Miri: Check that a ptr is aligned and inbounds already when evaluating `*`
This syncs Miri with what the Nomicon and the Reference say, and resolvesrust-lang/miri#447.
Also this would not have worked without rust-lang#62982 due to new cycles. ;)
r? @oli-obk
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge ofrust-lang#63075- RalfJung:deref-checks, r=oli-obk
c358476
Miri: Check that a ptr is aligned and inbounds already when evaluating `*`
This syncs Miri with what the Nomicon and the Reference say, and resolvesrust-lang/miri#447.
Also this would not have worked without rust-lang#62982 due to new cycles. ;)
r? @oli-obk
@emilyalbiniemilyalbini removed the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 21, 2019
@nikomatsakis

nikomatsakis commented Aug 29, 2019

Copy link
Copy Markdown
Contributor

Reviewed by the compiler team:

Accepted for beta backport

@RalfJung

RalfJung commented Aug 29, 2019

Copy link
Copy Markdown
Member

Didn't this land before the current beta branched?

@nikomatsakis

nikomatsakis commented Aug 29, 2019

Copy link
Copy Markdown
Contributor

I'm going to remove the beta nominated label. It seems like it either landed or got rolle up or something.

@nikomatsakisnikomatsakis removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 29, 2019
@RalfJung

RalfJung commented Aug 29, 2019

Copy link
Copy Markdown
Member

I also last-minute backported it to stable. Maybe that's where the confusion comes from.

@Mark-Simulacrum

Mark-Simulacrum commented Aug 29, 2019

Copy link
Copy Markdown
Member

This indeed made it into (current) beta I believe as part of a5e7bb3.

@lqdlqd mentioned this pull request Oct 25, 2019
Closed
@ecstatic-morseecstatic-morse mentioned this pull request Apr 13, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung approved these changes
@estebankestebankestebank approved these changes

Assignees

@RalfJungRalfJung

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Static cyclic references not compiled in current nightly rust version

9 participants

@oli-obk@rust-highfive@estebank@RalfJung@bors@nikomatsakis@Mark-Simulacrum@nagisa@emilyalbini