Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. #46436

   Doc-tests core
error: test failed, to rerun pass '--doc'
command did not execute successfully: "C:\\projects\\rust\\build\\i686-pc-windows-gnu\\stage0/bin\\cargo.exe" "test" "--target" "i686-pc-windows-gnu" "-j" "2" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "C:\\projects\\rust\\src/libstd/Cargo.toml" "-p" "std:0.0.0" "-p" "unwind:0.0.0" "-p" "alloc_system:0.0.0" "-p" "std_unicode:0.0.0" "-p" "libc:0.0.0" "-p" "compiler_builtins:0.0.0" "-p" "panic_abort:0.0.0" "-p" "alloc:0.0.0" "-p" "core:0.0.0" "--"
expected success, got: exit code: 3221225477
failed to run: C:\projects\rust\build\bootstrap\debug\bootstrap test
Build completed unsuccessfully in 1:58:02
Command exited with code 1

bors · 2017-12-05T16:10:36Z

⌛ Testing commit 9dbf4956e849ccd6f997ca12cf59d42493ca1f87 with merge cad9630522a85914c37d6526627c69d799073493...

bors · 2017-12-05T17:28:28Z

💔 Test failed - status-appveyor

kennytm · 2017-12-05T17:39:43Z

Could not compile rustdoc for i686-pc-windows-msvc again. This PR may have introduced a change that caused this to fail with some probability. Not going to retry.

eddyb · 2017-12-06T09:18:22Z

Is it running out of memory by any chance?

kennytm · 2017-12-06T09:20:14Z

I don't know, the log doesn't track memory use 😞

carols10cents · 2017-12-12T15:15:18Z

Soooo who might have some insight on why rustdoc can't build on appveyor? @rust-lang/infra ? @rust-lang/docs ?

GuillaumeGomez · 2017-12-12T16:43:08Z

Without more logs, it's gonna be complicated...

bors · 2017-12-16T18:55:08Z

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

eddyb · 2017-12-16T21:56:57Z

r? @oli-obk on the last ~~two~~ three commits (also, I'll have to update miri itself, too, right?).

oli-obk · 2017-12-17T08:43:50Z

src/librustc/mir/interpret/value.rs

@@ -9,8 +9,7 @@ use rustc_const_math::ConstFloat;
 #[derive(Copy, Clone, Debug)]
 pub struct PtrAndAlign {
    pub ptr: Pointer,
-    /// Remember whether this place is *supposed* to be aligned.
-    pub aligned: bool,
+    pub align: Align,


Awesome! I wanted to do this all along

oli-obk · 2017-12-17T08:56:55Z

src/librustc_mir/interpret/place.rs

    pub fn to_ptr(self) -> EvalResult<'tcx, MemoryPointer> {
-        let (ptr, extra) = self.to_ptr_extra_aligned();
-        // At this point, we forget about the alignment information -- the place has been turned into a reference,


Why did you remove the comment?

oli-obk

Threading through the alignments was the original idea. We scrapped it because we thought it would get too intrusive. With all the convenience methods on Align it seems good though

oli-obk · 2017-12-17T09:19:26Z

Just break miri. I want to refactor some of the ty arguments to layout arguments anyway, I'll just do that there

eddyb · 2017-12-17T14:35:45Z

@bors r=arielb1,oli-obk

bors · 2017-12-17T14:35:46Z

📌 Commit 799a83c has been approved by arielb1,oli-obk

bors · 2017-12-17T15:46:06Z

⌛ Testing commit 799a83c with merge 3cc68ba...

@oli-obk

Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. Closes #46423. cc @oli-obk

bors · 2017-12-17T18:53:12Z

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1,oli-obk
Pushing 3cc68ba to master...

rustc: ensure optimized enums have a properly aligned size. Fixes #46769 by padding the optimized enums wrapping packed data as necessary. Note that this is not the only way to solve this - on nightly, #46436 makes it easier to fix without adding new padding because of the replacement of `packed` flags with a non-redundant scheme. But because it can't be backported, the optimal fix will be in a separate nightly-only PR (#46809).

rust-highfive assigned arielb1 Dec 1, 2017

eddyb force-pushed the unpacked branch from f3362fe to 9dbf495 Compare December 4, 2017 09:57

kennytm 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 Dec 4, 2017

oli-obk mentioned this pull request Dec 5, 2017

Validate miri against the HIR const evaluator #45002

Merged

kennytm 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 Dec 5, 2017

eddyb force-pushed the unpacked branch from 2d17dc7 to 45168e6 Compare December 16, 2017 21:56

oli-obk approved these changes Dec 17, 2017

View reviewed changes

oli-obk reviewed Dec 17, 2017

View reviewed changes

eddyb added 7 commits December 17, 2017 16:34

rustc: don't track whether layouts are "packed".

7c6f242

rustc_trans: always keep track of the Align in LvalueRef.

1630746

rustc_trans: always require alignment for load/store/memcpy.

5cab0bf

miri: track the Align instead of packedness in PtrAndAlign.

ff080d3

miri: use separate Pointer and Align instead of PtrAndAlign.

08646c6

miri: pass pointer alignments directly instead of contextually.

7dc79cc

Mark miri as broken.

799a83c

eddyb force-pushed the unpacked branch from 9f9f7db to 799a83c Compare December 17, 2017 14:35

bors added a commit that referenced this pull request Dec 17, 2017

Auto merge of #46436 - eddyb:unpacked, r=arielb1,oli-obk

3cc68ba

Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. Closes #46423. cc @oli-obk

bors merged commit 799a83c into rust-lang:master Dec 17, 2017

bors mentioned this pull request Dec 17, 2017

Ignore panic functions in backtraces. Print inlined functions on Windows #45637

Closed

eddyb deleted the unpacked branch December 17, 2017 18:54

bors mentioned this pull request Dec 17, 2017

[auto-toolstate] Upload the toolstate result to an external git repository, and removes BuildExpectation #46554

Merged

dwrensha added a commit to dwrensha/seer that referenced this pull request Dec 18, 2017

"fix" breakage from rust-lang/rust#46436

517c45a

eddyb mentioned this pull request Dec 18, 2017

rustc: ensure optimized enums have a properly aligned size. #46808

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. #46436

Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. #46436

eddyb commented Dec 1, 2017 •

edited

Loading

rust-highfive commented Dec 1, 2017

kennytm commented Dec 4, 2017

arielb1 commented Dec 4, 2017

bors commented Dec 4, 2017

bors commented Dec 5, 2017

bors commented Dec 5, 2017

kennytm commented Dec 5, 2017

bors commented Dec 5, 2017

bors commented Dec 5, 2017

kennytm commented Dec 5, 2017

bors commented Dec 5, 2017

bors commented Dec 5, 2017

kennytm commented Dec 5, 2017

eddyb commented Dec 6, 2017

kennytm commented Dec 6, 2017

carols10cents commented Dec 12, 2017

GuillaumeGomez commented Dec 12, 2017

bors commented Dec 16, 2017

eddyb commented Dec 16, 2017 •

edited

Loading

oli-obk Dec 17, 2017

oli-obk Dec 17, 2017

oli-obk left a comment

oli-obk commented Dec 17, 2017

eddyb commented Dec 17, 2017

bors commented Dec 17, 2017

bors commented Dec 17, 2017

bors commented Dec 17, 2017

Detect unaligned fields via aggregate.align < field.align, instead of a packed flag. #46436

Detect unaligned fields via aggregate.align < field.align, instead of a packed flag. #46436

Conversation

eddyb commented Dec 1, 2017 • edited Loading

rust-highfive commented Dec 1, 2017

kennytm commented Dec 4, 2017

arielb1 commented Dec 4, 2017

bors commented Dec 4, 2017

bors commented Dec 5, 2017

bors commented Dec 5, 2017

kennytm commented Dec 5, 2017

bors commented Dec 5, 2017

bors commented Dec 5, 2017

kennytm commented Dec 5, 2017

bors commented Dec 5, 2017

bors commented Dec 5, 2017

kennytm commented Dec 5, 2017

eddyb commented Dec 6, 2017

kennytm commented Dec 6, 2017

carols10cents commented Dec 12, 2017

GuillaumeGomez commented Dec 12, 2017

bors commented Dec 16, 2017

eddyb commented Dec 16, 2017 • edited Loading

oli-obk Dec 17, 2017

Choose a reason for hiding this comment

oli-obk Dec 17, 2017

Choose a reason for hiding this comment

oli-obk left a comment

Choose a reason for hiding this comment

oli-obk commented Dec 17, 2017

eddyb commented Dec 17, 2017

bors commented Dec 17, 2017

bors commented Dec 17, 2017

bors commented Dec 17, 2017

Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. #46436

Detect unaligned fields via `aggregate.align < field.align`, instead of a `packed` flag. #46436

eddyb commented Dec 1, 2017 •

edited

Loading

eddyb commented Dec 16, 2017 •

edited

Loading