Simplify `ConstValue::ScalarPair` #57442

oli-obk · 2019-01-08T13:21:09Z

While looking at #57432 I realized that some of our types for representing constants are very big. This reduces LazyConst to 3/4th of its original size and simplifies some code around slices at the same time.

r? @RalfJung

varkor · 2019-01-08T14:38:50Z

src/librustc/mir/interpret/value.rs

-    /// Needed for pattern matching code related to slices and strings.
-    ScalarPair(Scalar, Scalar),
+    /// Used only for slices and strings (`&[T]`, `&str`, `*const [T]`, `*mut str`, `Box<str>`, ...)
+    Slice(Scalar, u64),


I like this name change; ScalarPair felt a little bit cryptic.

src/librustc/mir/interpret/value.rs

src/librustc_mir/const_eval.rs

RalfJung · 2019-01-09T14:44:37Z

Nice! r=me with the comment fixed.

oli-obk · 2019-01-09T15:12:15Z

@bors r=RalfJung

bors · 2019-01-09T15:12:16Z

📌 Commit 3fba811 has been approved by RalfJung

oli-obk · 2019-01-09T15:22:10Z

@bors r=RalfJung

bors · 2019-01-09T15:22:11Z

📌 Commit 3177a6f has been approved by RalfJung

bors · 2019-01-10T06:07:41Z

⌛ Testing commit 3177a6f with merge e0f0935a9bb44cbac7917ae2d2a6e7936cb60f17...

bors · 2019-01-10T06:07:56Z

💔 Test failed - status-appveyor

RalfJung · 2019-01-10T07:55:13Z

Log is empty. Probably spurious.

Cc @rust-lang/infra: same as #57351 (comment)

RalfJung · 2019-01-10T07:55:20Z

@bors retry

@RalfJung

Simplify `ConstValue::ScalarPair` While looking at rust-lang#57432 I realized that some of our types for representing constants are very big. This reduces `LazyConst` to 3/4th of its original size and simplifies some code around slices at the same time. r? @RalfJung

Centril · 2019-01-13T01:06:13Z

@bors r-

Failed in rollup, #57554 (comment)

oli-obk · 2019-01-14T12:59:01Z

@bors r=RalfJung

bors · 2019-01-14T12:59:02Z

📌 Commit d7f57d4 has been approved by RalfJung

oli-obk · 2019-01-27T20:42:05Z

@bors r=RalfJung

bors · 2019-01-27T20:42:06Z

📌 Commit fe50b4e has been approved by RalfJung

@RalfJung

Simplify `ConstValue::ScalarPair` While looking at rust-lang#57432 I realized that some of our types for representing constants are very big. This reduces `LazyConst` to 3/4th of its original size and simplifies some code around slices at the same time. r? @RalfJung

bors · 2019-01-28T00:41:13Z

⌛ Testing commit fe50b4e with merge d2bdef561cf118a8795ec962ee501dc17d097c76...

bors · 2019-01-28T00:44:11Z

💔 Test failed - status-appveyor

Centril · 2019-01-28T00:45:18Z

@bors retry

rust-highfive · 2019-01-28T00:46:09Z

Your PR failed on Travis (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.

Cloning into 'rust-lang/rust'...
travis_time:end:088bef61:start=1548636286613029111,finish=1548636292588140134,duration=5975111023
$ cd rust-lang/rust
$ git checkout -qf d2bdef561cf118a8795ec962ee501dc17d097c76
fatal: reference is not a tree: d2bdef561cf118a8795ec962ee501dc17d097c76
The command "git checkout -qf d2bdef561cf118a8795ec962ee501dc17d097c76" failed and exited with 128 during .
Your build has been stopped.

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 @TimNN. (Feature Requests)

bors · 2019-01-28T00:46:15Z

⌛ Testing commit fe50b4e with merge ec504de...

@RalfJung

Simplify `ConstValue::ScalarPair` While looking at #57432 I realized that some of our types for representing constants are very big. This reduces `LazyConst` to 3/4th of its original size and simplifies some code around slices at the same time. r? @RalfJung

bors · 2019-01-28T03:21:46Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing ec504de to master...

rasendubi

Also, rustc-guide refers to ScalarPair in const-eval and miri chapters.

rasendubi · 2019-04-20T22:20:05Z

src/librustc/mir/interpret/value.rs

@@ -22,22 +22,28 @@ pub enum ConstValue<'tcx> {
    /// Not using the enum `Value` to encode that this must not be `Undef`


The comment above needs an update as there is no more ScalarPair

/// Represents a constant value in Rust. Scalar and ScalarPair are optimizations which /// matches the LocalValue optimizations for easy conversions between Value and ConstValue.

rust-highfive assigned RalfJung Jan 8, 2019

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

varkor reviewed Jan 8, 2019

View reviewed changes

RalfJung reviewed Jan 9, 2019

View reviewed changes

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

RalfJung reviewed Jan 9, 2019

View reviewed changes

src/librustc_mir/const_eval.rs Show resolved Hide resolved

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 9, 2019

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 Jan 10, 2019

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 10, 2019

pietroalbini mentioned this pull request Jan 12, 2019

Rollup of 15 pull requests #57554

Closed

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 13, 2019

oli-obk force-pushed the lazy_const branch from 3177a6f to d7f57d4 Compare January 14, 2019 12:58

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 26, 2019

oli-obk added 3 commits January 27, 2019 20:30

Fix indentation

1578955

Add some size assertions for const eval types

2a17488

ConstValue::ScalarPair only needs to represent slices

fe50b4e

oli-obk force-pushed the lazy_const branch from d7f57d4 to fe50b4e Compare January 27, 2019 20:41

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

Centril mentioned this pull request Jan 27, 2019

Rollup of 3 pull requests #57938

Closed

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 Jan 28, 2019

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 28, 2019

bors merged commit fe50b4e into rust-lang:master Jan 28, 2019

bors mentioned this pull request Jan 28, 2019

Refactor rustc_codegen_ssa (part 2) #56636

Closed

matthiaskrgr mentioned this pull request Jan 28, 2019

needs rustup rust-lang/rust-clippy#3709

Closed

memoryruins mentioned this pull request Jan 30, 2019

Compile time perf regression for packed-simd's max-rss #57432

Closed

rasendubi reviewed Apr 20, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify `ConstValue::ScalarPair` #57442

Simplify `ConstValue::ScalarPair` #57442

oli-obk commented Jan 8, 2019

varkor Jan 8, 2019

RalfJung commented Jan 9, 2019

oli-obk commented Jan 9, 2019

bors commented Jan 9, 2019

oli-obk commented Jan 9, 2019

bors commented Jan 9, 2019

bors commented Jan 10, 2019

bors commented Jan 10, 2019

RalfJung commented Jan 10, 2019

RalfJung commented Jan 10, 2019

Centril commented Jan 13, 2019

oli-obk commented Jan 14, 2019

bors commented Jan 14, 2019

oli-obk commented Jan 27, 2019

bors commented Jan 27, 2019

bors commented Jan 28, 2019

bors commented Jan 28, 2019

Centril commented Jan 28, 2019

rust-highfive commented Jan 28, 2019

bors commented Jan 28, 2019

bors commented Jan 28, 2019

rasendubi left a comment

rasendubi Apr 20, 2019

		@@ -22,22 +22,28 @@ pub enum ConstValue<'tcx> {
		/// Not using the enum `Value` to encode that this must not be `Undef`

Simplify ConstValue::ScalarPair #57442

Simplify ConstValue::ScalarPair #57442

Conversation

oli-obk commented Jan 8, 2019

varkor Jan 8, 2019

Choose a reason for hiding this comment

RalfJung commented Jan 9, 2019

oli-obk commented Jan 9, 2019

bors commented Jan 9, 2019

oli-obk commented Jan 9, 2019

bors commented Jan 9, 2019

bors commented Jan 10, 2019

bors commented Jan 10, 2019

RalfJung commented Jan 10, 2019

RalfJung commented Jan 10, 2019

Centril commented Jan 13, 2019

oli-obk commented Jan 14, 2019

bors commented Jan 14, 2019

oli-obk commented Jan 27, 2019

bors commented Jan 27, 2019

bors commented Jan 28, 2019

bors commented Jan 28, 2019

Centril commented Jan 28, 2019

rust-highfive commented Jan 28, 2019

bors commented Jan 28, 2019

bors commented Jan 28, 2019

rasendubi left a comment

Choose a reason for hiding this comment

rasendubi Apr 20, 2019

Choose a reason for hiding this comment

Simplify `ConstValue::ScalarPair` #57442

Simplify `ConstValue::ScalarPair` #57442