New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some cleanups around `AllocId` management #56461

Merged
merged 11 commits into from Dec 13, 2018

Conversation

Projects
None yet
7 participants
@oli-obk
Contributor

oli-obk commented Dec 3, 2018

Show resolved Hide resolved src/librustc/mir/interpret/mod.rs Outdated
}

pub fn get(&self, id: AllocId) -> Option<AllocType<'tcx, M>> {
/// Returns `None` in case the `AllocId` is dangling.

This comment has been minimized.

@RalfJung

RalfJung Dec 4, 2018

Member

"Dangling" for the global memory only, right? It could still be allocated in the local (EvalContext) memory?

This comment has been minimized.

@oli-obk

oli-obk Dec 4, 2018

Contributor

Yes, but the local memory will never hit the global one if it has that AllocId locally.

This comment has been minimized.

@RalfJung

RalfJung Dec 4, 2018

Member

Sure, I just think the comment should explain what "dangling" means here.

@RalfJung

LGTM!

@RalfJung

This comment has been minimized.

Member

RalfJung commented Dec 11, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Dec 11, 2018

📌 Commit 7181aa1 has been approved by RalfJung

@bors

This comment has been minimized.

Contributor

bors commented Dec 11, 2018

⌛️ Testing commit 7181aa1 with merge 91d4020...

bors added a commit that referenced this pull request Dec 11, 2018

Auto merge of #56461 - oli-obk:alloc_ids, r=RalfJung
Some cleanups around `AllocId` management

r? @eddyb
cc @RalfJung
@bors

This comment has been minimized.

Contributor

bors commented Dec 11, 2018

💔 Test failed - status-appveyor

@rust-highfive

This comment has been minimized.

Collaborator

rust-highfive commented Dec 11, 2018

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.
Checking out files: 100% (17616/17616), done.
travis_time:end:04d358e4:start=1544571267205753000,finish=1544571277078950000,duration=9873197000
$ cd rust-lang/rust
$ git checkout -qf 91d4020bff9ffad6472bb681b9954fd1f117a640
fatal: reference is not a tree: 91d4020bff9ffad6472bb681b9954fd1f117a640
The command "git checkout -qf 91d4020bff9ffad6472bb681b9954fd1f117a640" 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)

@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Dec 11, 2018

@bors: retry

  • CI automation hiccup
@bors

This comment has been minimized.

Contributor

bors commented Dec 12, 2018

⌛️ Testing commit 7181aa1 with merge 89912da...

bors added a commit that referenced this pull request Dec 12, 2018

Auto merge of #56461 - oli-obk:alloc_ids, r=RalfJung
Some cleanups around `AllocId` management

r? @eddyb
cc @RalfJung
@bors

This comment has been minimized.

Contributor

bors commented Dec 12, 2018

💔 Test failed - status-appveyor

@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Dec 12, 2018

@bors: retry

@bors

This comment has been minimized.

Contributor

bors commented Dec 13, 2018

⌛️ Testing commit 7181aa1 with merge 28e4bc8...

bors added a commit that referenced this pull request Dec 13, 2018

Auto merge of #56461 - oli-obk:alloc_ids, r=RalfJung
Some cleanups around `AllocId` management

r? @eddyb
cc @RalfJung
@bors

This comment has been minimized.

Contributor

bors commented Dec 13, 2018

💔 Test failed - status-travis

@rust-highfive

This comment has been minimized.

Collaborator

rust-highfive commented Dec 13, 2018

The job x86_64-gnu-aux 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:40:25] 
[01:40:25] testing https://github.com/servo/servo
[01:40:25] Initialized empty Git repository in /checkout/obj/build/ct/servo/.git/
[01:40:25] fatal: Could not parse object '987e376ca7a4245dbc3e0c06e963278ee1ac92d1'.
[01:44:41] fatal: unable to access 'https://github.com/servo/servo/': gnutls_handshake() failed: Error in the pull function.
[01:44:41] thread 'main' panicked at 'assertion failed: status.success()', src/tools/cargotest/main.rs:124:13
[01:44:41] 
[01:44:41] 
[01:44:41] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/cargotest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/ct"
[01:44:41] expected success, got: exit code: 101
[01:44:41] expected success, got: exit code: 101
[01:44:41] 
[01:44:41] 
[01:44:41] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/pretty src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/test/run-fail-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:44:41] Build completed unsuccessfully in 0:41:46
[01:44:41] make: *** [check-aux] Error 1
[01:44:41] Makefile:60: recipe for target 'check-aux' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0bdab0ee
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Dec 13 11:34:31 UTC 2018
---
travis_time:end:05576886:start=1544700875076760122,finish=1544700875086218243,duration=9458121
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0a31331f
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:start:crashlog
obj/cores/core.30920.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2!bin!rustc
[New LWP 30920]
warning: Could not load shared library symbols for 8 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `rustc --crate-name foo src/lib.rs --color never --crate-type lib --emit=dep-inf'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007fb5d9685428 in ?? ()
#0  0x00007fb5d9685428 in ?? ()
#1  0x00007fb5d968702a in ?? ()
#2  0x0000000000000020 in ?? ()
#3  0x0000000000000000 in ?? ()
travis_time:end:0a31331f:start=1544700875094678603,finish=1544700876752001708,duration=1657323105
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:046e63b2
travis_time:start:046e63b2
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0b3ae0c0
$ dmesg | grep -i kill

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)

@oli-obk

This comment has been minimized.

Contributor

oli-obk commented Dec 13, 2018

@bors retry network/tls error

@bors

This comment has been minimized.

Contributor

bors commented Dec 13, 2018

⌛️ Testing commit 7181aa1 with merge 7489ee9...

bors added a commit that referenced this pull request Dec 13, 2018

Auto merge of #56461 - oli-obk:alloc_ids, r=RalfJung
Some cleanups around `AllocId` management

r? @eddyb
cc @RalfJung
@kennytm

This comment has been minimized.

Member

kennytm commented Dec 13, 2018

@bors ping

@bors

This comment has been minimized.

Contributor

bors commented Dec 13, 2018

😪 I'm awake I'm awake

@alexcrichton

This comment has been minimized.

@alexcrichton alexcrichton merged commit 7181aa1 into rust-lang:master Dec 13, 2018

1 of 2 checks passed

homu Testing commit 7181aa176393d601f43704d886e8e7afa4b14e45 with merge 7489ee9c6f92050a12a3a3097df0a7d3737d82ec...
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rust-highfive

This comment has been minimized.

Collaborator

rust-highfive commented Dec 13, 2018

📣 Toolstate changed by #56461!

Tested on commit 7489ee9.
Direct link to PR: #56461

💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 rls on linux: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 13, 2018

📣 Toolstate changed by rust-lang/rust#56461!
Tested on commit rust-lang/rust@7489ee9.
Direct link to PR: <rust-lang/rust#56461>

💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 rls on linux: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
@bors

This comment has been minimized.

Contributor

bors commented Dec 13, 2018

💥 Test timed out

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment