Misc changes related to Miri allocations #50520

Zoxc · 2018-05-07T21:45:46Z

This builds on top of #50249

rust-highfive · 2018-05-07T22:10:08Z

The job x86_64-gnu-llvm-3.9 of 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.

[00:21:03]    Compiling rustc_lsan v0.0.0 (file:///checkout/src/librustc_lsan)
[00:21:03]    Compiling rustc_asan v0.0.0 (file:///checkout/src/librustc_asan)
[00:21:04]    Compiling rustc_msan v0.0.0 (file:///checkout/src/librustc_msan)
[00:21:04]    Compiling rustc_tsan v0.0.0 (file:///checkout/src/librustc_tsan)
[00:21:44] thread 'main' panicked at 'already borrowed: BorrowMutError', libcore/result.rs:945:5
[00:21:44] 
[00:21:44] error: internal compiler error: unexpected panic
[00:21:44] 
[00:21:44] 
[00:21:44] note: the compiler unexpectedly panicked. this is a bug.
[00:21:44] 
[00:21:44] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[00:21:44] note: rustc 1.27.0-dev running on x86_64-unknown-linux-gnu
[00:21:44] 
[00:21:44] 
[00:21:44] note: compiler flags: -Z force-unstable-if-unmarked -C opt-level=3 -C prefer-dynamic -C debug-assertions=y -C link-args=-Wl,-rpath,$ORIGIN/../lib --crate-type lib
[00:21:44] 
[00:21:44] note: some of the compiler flags provided by cargo are hidden
[00:21:44] error: Could not compile `core`.
[00:21:44] 
[00:21:44] Caused by:
[00:21:44]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name core libcore/lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=3 -C metadata=07c899b6c3d44697 -C extra-filename=-07c899b6c3d44697 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps` (exit code: 101)
[00:21:44]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name core libcore/lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=3 -C metadata=07c899b6c3d44697 -C extra-filename=-07c899b6c3d44697 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps` (exit code: 101)
[00:21:44] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[00:21:44] expected success, got: exit code: 101
[00:21:44] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1091:9
[00:21:44] travis_fold:end:stage1-std

[00:21:44] travis_time:end:stage1-std:start=1525730947458649905,finish=1525731000868459000,duration=53409809095


[00:21:44] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:21:44] Build completed unsuccessfully in 0:16:56
[00:21:44] make: *** [all] Error 1
[00:21:44] Makefile:28: recipe for target 'all' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:03a7d0d4
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

rust-highfive · 2018-05-08T16:02:57Z

The job x86_64-gnu-llvm-3.9 of 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.

[01:01:52] ..........i..............................i..........................................................
[01:01:59] ....................................................................................................
[01:02:05] ............i.......................................................................................
[01:02:13] ....................................................................................................
[01:02:22] .....................................................F..............................................
[01:02:41] ....................................................................................................
[01:02:53] ....................................................................................................
[01:03:02] .....i..............................................................................................
[01:03:10] ....i..ii...........................................................................................
---
[01:04:14] 
[01:04:14] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:492:22
[01:04:14] 
[01:04:14] 
[01:04:14] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/compile-fail" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "compile-fail" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-3.9/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "3.9.1\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:04:14] 
[01:04:14] 
[01:04:14] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:04:14] Build complet

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 · 2018-05-10T16:32:47Z

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

bors · 2018-05-12T04:14:12Z

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

bors · 2018-05-16T23:50:00Z

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

pietroalbini · 2018-05-21T11:11:19Z

Ping from triage @oli-obk! This PR needs your review.
@Zoxc there are some merge conflicts.

oli-obk

As discussed on IRC I am very unsure about the last commit. We had a scheme like that when miri was merged, and we kept running into various edge cases with the decoding order. Even creating MCVEs for the panics we were getting was hard, because small changes in the code would change the order of evaluation.

cc @michaelwoerister

oli-obk · 2018-05-21T11:30:53Z

src/librustc/ich/impls_ty.rs

        });
    }
 }

+impl<'a, 'gcx, M: HashStable<StableHashingContext<'a>>> HashStable<StableHashingContext<'a>>


This implementation could be replaced by a impl_stable_hash_for! macro call

I don't think we have a macro which works for enums with lifetimes.

Zoxc · 2018-05-22T02:19:43Z

I've split the last commit into a separate PR.

oli-obk · 2018-05-22T05:35:21Z

src/bootstrap/lib.rs

@@ -592,12 +592,20 @@ impl Build {
            Path::new(llvm_bindir.trim()).join(exe("FileCheck", &*target))
        } else {
            let base = self.llvm_out(self.config.build).join("build");
-            let exe = exe("FileCheck", &*target);
-            if !self.config.ninja && self.config.build.contains("msvc") {


Please put this in a separate PR, I have no idea what this does or why it's here

oli-obk · 2018-05-22T08:45:55Z

@bors r+

bors · 2018-05-22T08:45:56Z

📌 Commit ddc5418 has been approved by oli-obk

bors · 2018-05-22T10:36:07Z

⌛ Testing commit ddc5418 with merge ff8fa5c...

@oli-obk

Misc changes related to Miri allocations This builds on top of #50249 r? @oli-obk

bors · 2018-05-22T12:57:00Z

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

alexcrichton · 2018-05-31T19:44:39Z

FWIW this hurt the max-rss usage on a few benchmarks (but not by huge amounts)

oli-obk · 2018-05-31T21:00:13Z

Might be due to the removed cache for strings and byte strings

rust-highfive assigned oli-obk May 7, 2018

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

Zoxc force-pushed the alloc-misc branch from 6ceeb72 to 54e67d1 Compare May 8, 2018 14:56

Zoxc force-pushed the alloc-misc branch from 54e67d1 to 90575c4 Compare May 10, 2018 12:56

Zoxc force-pushed the alloc-misc branch from 90575c4 to 5654385 Compare May 10, 2018 21:08

Zoxc force-pushed the alloc-misc branch from 5654385 to 3b7c308 Compare May 12, 2018 12:19

Zoxc mentioned this pull request May 16, 2018

Make GlobalCtxt thread-safe #50108

Merged

oli-obk requested changes May 21, 2018

View reviewed changes

Zoxc force-pushed the alloc-misc branch from 3b7c308 to c5fa93e Compare May 22, 2018 01:02

Zoxc added 3 commits May 22, 2018 04:15

Get rid of literal_alloc_cache

aace842

Move the allocation interner out of InterpretInternerInner

9016750

Introduce AllocType which indicates what AllocIds point to

ddc5418

Zoxc force-pushed the alloc-misc branch from c5fa93e to 29e74e9 Compare May 22, 2018 02:16

Zoxc mentioned this pull request May 22, 2018

Make AllocId decoding thread-safe #50957

Closed

oli-obk reviewed May 22, 2018

View reviewed changes

oli-obk approved these changes May 22, 2018

View reviewed changes

Zoxc force-pushed the alloc-misc branch from 29e74e9 to ddc5418 Compare May 22, 2018 05:38

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 22, 2018

bors added a commit that referenced this pull request May 22, 2018

Auto merge of #50520 - Zoxc:alloc-misc, r=oli-obk

ff8fa5c

Misc changes related to Miri allocations This builds on top of #50249 r? @oli-obk

bors merged commit ddc5418 into rust-lang:master May 22, 2018

This was referenced May 22, 2018

Use different datastructure for MIRI relocations #50866

Merged

implement Ord for OutlivesPredicate and other types #50930

Merged

[WIP] Use a custom hash set for interning #50959

Closed

Zoxc deleted the alloc-misc branch May 22, 2018 20:52

mati865 mentioned this pull request May 23, 2018

Build failure with nightly 2018-05-21 rust-lang/rust-clippy#2788

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Misc changes related to Miri allocations #50520

Misc changes related to Miri allocations #50520

Zoxc commented May 7, 2018

rust-highfive commented May 7, 2018

rust-highfive commented May 8, 2018

bors commented May 10, 2018

bors commented May 12, 2018

bors commented May 16, 2018

pietroalbini commented May 21, 2018

oli-obk left a comment

oli-obk May 21, 2018

Zoxc May 21, 2018

Zoxc commented May 22, 2018

oli-obk May 22, 2018

oli-obk commented May 22, 2018

bors commented May 22, 2018

bors commented May 22, 2018

bors commented May 22, 2018

alexcrichton commented May 31, 2018

oli-obk commented May 31, 2018

Misc changes related to Miri allocations #50520

Misc changes related to Miri allocations #50520

Conversation

Zoxc commented May 7, 2018

rust-highfive commented May 7, 2018

rust-highfive commented May 8, 2018

bors commented May 10, 2018

bors commented May 12, 2018

bors commented May 16, 2018

pietroalbini commented May 21, 2018

oli-obk left a comment

Choose a reason for hiding this comment

oli-obk May 21, 2018

Choose a reason for hiding this comment

Zoxc May 21, 2018

Choose a reason for hiding this comment

Zoxc commented May 22, 2018

oli-obk May 22, 2018

Choose a reason for hiding this comment

oli-obk commented May 22, 2018

bors commented May 22, 2018

bors commented May 22, 2018

bors commented May 22, 2018

alexcrichton commented May 31, 2018

oli-obk commented May 31, 2018