rename Scalar::Bits to Scalar::Raw and bits field to data#61164

RalfJung · 2019-05-25T09:01:38Z

Also use this opportunity to seal some abstraction leaks (other modules constructing Scalar::Bits directly instead of using a constructor).

r? @oli-obk

oli-obk · 2019-05-25T09:04:30Z

#59276 has priority over this (there will be conflicts) cc @varkor

bors · 2019-05-25T19:11:22Z

☔ The latest upstream changes (presumably #59276) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk · 2019-05-25T19:14:26Z

r=me after rebase

RalfJung · 2019-05-26T12:42:30Z

I decided to also refactor how we are doing the scalar sanity checks a bit. And I'd like to see how expensive these checks are.

@bors try

bors · 2019-05-26T12:42:40Z

⌛ Trying commit aad13a1 with merge 2189421...

@oli-obk

rename Scalar::Bits to Scalar::Raw and bits field to data Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor). r? @oli-obk

RalfJung · 2019-05-26T12:43:25Z

Oh and I found a bug in the signed pointer offset code that could lead to those sanity checks failing. ;)

src/librustc/mir/interpret/pointer.rs

src/librustc/mir/interpret/value.rs

src/librustc/mir/interpret/pointer.rs

bors · 2019-05-26T14:54:28Z

☀️ Try build successful - checks-travis
Build commit: 2189421

RalfJung · 2019-05-26T15:16:25Z

@rust-timer build 2189421

rust-timer · 2019-05-26T15:16:26Z

Success: Queued 2189421 with parent 566f3d7, comparison URL.

rust-timer · 2019-05-26T19:30:47Z

Finished benchmarking try commit 2189421: comparison url

RalfJung · 2019-05-26T20:53:34Z

Timing looks much better than I expected! max <4%. I'll still demote some of these to debug_assert, but that means debug-assert-enabled builds check things much more now than they used to.

RalfJung · 2019-05-26T21:30:42Z

Now with fewer assertions.

@bors try

bors · 2019-05-26T21:30:53Z

⌛ Trying commit 829d8de with merge 2eefc6c...

@oli-obk

rename Scalar::Bits to Scalar::Raw and bits field to data Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor). r? @oli-obk

src/librustc/mir/interpret/value.rs

bors · 2019-05-27T10:56:45Z

⌛ Trying commit fe19ed8 with merge f3c7924...

@oli-obk

rename Scalar::Bits to Scalar::Raw and bits field to data Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor). r? @oli-obk

bors · 2019-05-27T13:06:06Z

☀️ Try build successful - checks-travis
Build commit: f3c7924

RalfJung · 2019-05-27T13:09:45Z

@rust-timer build f3c7924

rust-timer · 2019-05-27T13:09:46Z

Success: Queued f3c7924 with parent ab7cf71, comparison URL.

rust-timer · 2019-05-27T17:24:11Z

Finished benchmarking try commit f3c7924: comparison url

RalfJung · 2019-05-27T17:26:43Z

This looks good perf-wise!

RalfJung · 2019-05-27T17:28:32Z

@bors r=oli-obk

bors · 2019-05-27T17:28:34Z

📌 Commit fe19ed8 has been approved by oli-obk

RalfJung · 2019-05-28T07:54:07Z

This is on the critical path to make Miri work again.

@bors p=1

@oli-obk

rename Scalar::Bits to Scalar::Raw and bits field to data Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor). r? @oli-obk

@oli-obk

rename Scalar::Bits to Scalar::Raw and bits field to data Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor). r? @oli-obk

@ghost

Rollup of 4 pull requests Successful merges: - #61123 (Allow to specify profiling data output directory as -Zself-profile argument.) - #61159 (split core::ptr module into multiple files) - #61164 (rename Scalar::Bits to Scalar::Raw and bits field to data) - #61250 (Remove special case for *ios* builds in run-make-fulldeps/print-target-list Makefile) Failed merges: r? @ghost

(which is included in rust-lang/rust#61274)

bors · 2019-05-28T20:31:07Z

⌛ Testing commit fe19ed8 with merge 7212685...

rustup rust-lang/rust#61164 (which is included in rust-lang/rust#61274) changelog: none

Changes: ```` Rustup to rust-lang#61203 rustup rust-lang#60928 rustup rust-lang#61164 (which is included in rust-lang#61274) ````

@oli-obk

submodules: update clippy from fb33fad to d2f5122 Changes: ```` Rustup to #61203 rustup #60928 rustup #61164 (which is included in #61274) ```` Fixes #61287 r? @oli-obk

Changes: ```` Rustup to rust-lang/rust#61203 rustup rust-lang/rust#60928 rustup rust-lang/rust#61164 (which is included in rust-lang/rust#61274) ````

rust-highfive assigned oli-obk May 25, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 25, 2019

oli-obk added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label May 25, 2019

RalfJung added 3 commits May 26, 2019 11:08

rename Scalar::Bits to Scalar::Raw and bits field to data

082da0c

fix overflow error in signed wrapping offset

3defb3f

centralize Scalar size sanity checks and also do them in release builds

aad13a1

RalfJung force-pushed the scalar branch from a9d3bb3 to aad13a1 Compare May 26, 2019 12:41

RalfJung removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label May 26, 2019

RalfJung mentioned this pull request May 26, 2019

update for rustc Scalar changes, test for pointer wrapping ICE rust-lang/miri#744

Merged

oli-obk reviewed May 26, 2019

View reviewed changes

src/librustc/mir/interpret/pointer.rs Show resolved Hide resolved

oli-obk reviewed May 26, 2019

View reviewed changes

src/librustc/mir/interpret/value.rs Show resolved Hide resolved

Centril reviewed May 26, 2019

View reviewed changes

src/librustc/mir/interpret/pointer.rs Show resolved Hide resolved

src/librustc/mir/interpret/pointer.rs Show resolved Hide resolved

oli-obk reviewed May 26, 2019

View reviewed changes

src/librustc/mir/interpret/value.rs Outdated Show resolved Hide resolved

oli-obk approved these changes May 26, 2019

View reviewed changes

This comment has been minimized.

Sign in to view

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 May 27, 2019

Centril mentioned this pull request May 28, 2019

Rollup of 4 pull requests #61269

Closed

Centril mentioned this pull request May 28, 2019

Rollup of 4 pull requests #61274

Merged

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request May 28, 2019

rustup rust-lang/rust#61164

c9cc11e

(which is included in rust-lang/rust#61274)

bors merged commit fe19ed8 into rust-lang:master May 28, 2019

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 28, 2019

Auto merge of #4152 - matthiaskrgr:rustup_4, r=matthiaskrgr

487e6eb

rustup rust-lang/rust#61164 (which is included in rust-lang/rust#61274) changelog: none

Centril mentioned this pull request May 28, 2019

rls no longer builds after rust-lang/rust#61274 #61287

Closed

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 28, 2019

Auto merge of #4152 - matthiaskrgr:rustup_4, r=matthiaskrgr

a05f18e

rustup rust-lang/rust#61164 (which is included in rust-lang/rust#61274) changelog: none

RalfJung deleted the scalar branch May 29, 2019 08:01

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 30, 2019

submodules: update clippy from fb33fad to d2f5122

9817f19

Changes: ```` Rustup to rust-lang#61203 rustup rust-lang#60928 rustup rust-lang#61164 (which is included in rust-lang#61274) ````

Uh oh!

Conversation

RalfJung commented May 25, 2019

Uh oh!

oli-obk commented May 25, 2019

Uh oh!

bors commented May 25, 2019

Uh oh!

oli-obk commented May 25, 2019

Uh oh!

RalfJung commented May 26, 2019

Uh oh!

bors commented May 26, 2019

Uh oh!

RalfJung commented May 26, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented May 26, 2019

Uh oh!

RalfJung commented May 26, 2019

Uh oh!

rust-timer commented May 26, 2019

Uh oh!

rust-timer commented May 26, 2019

Uh oh!

RalfJung commented May 26, 2019

Uh oh!

RalfJung commented May 26, 2019

Uh oh!

bors commented May 26, 2019

Uh oh!

Uh oh!

This comment has been minimized.

bors commented May 27, 2019

Uh oh!

bors commented May 27, 2019

Uh oh!

RalfJung commented May 27, 2019

Uh oh!

rust-timer commented May 27, 2019

Uh oh!

rust-timer commented May 27, 2019

Uh oh!

RalfJung commented May 27, 2019

Uh oh!

RalfJung commented May 27, 2019

Uh oh!

bors commented May 27, 2019

Uh oh!

RalfJung commented May 28, 2019

Uh oh!

bors commented May 28, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants