Skip to content
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

debuginfo: Fix regression in namespace handling for struct types. #33225

Merged
merged 2 commits into from
May 6, 2016

Conversation

michaelwoerister
Copy link
Member

Fixes a small regression that has been introduced in recent refactorings.

Fixes #33193

r? @eddyb

@eddyb
Copy link
Member

eddyb commented Apr 26, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Apr 26, 2016

📌 Commit 7531e15 has been approved by eddyb

@bors
Copy link
Contributor

bors commented Apr 27, 2016

⌛ Testing commit 7531e15 with merge 850a3db...

@bors
Copy link
Contributor

bors commented Apr 27, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@michaelwoerister
Copy link
Member Author

Oh, yeah, our LLDB test framework removes newlines from the output...

@michaelwoerister michaelwoerister force-pushed the fix-debuginfo-struct-ns branch from 7531e15 to 6074463 Compare April 28, 2016 18:24
@michaelwoerister
Copy link
Member Author

I changed how the test case is written. Let's give it another try.

@michaelwoerister
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Contributor

bors commented Apr 28, 2016

📌 Commit 6074463 has been approved by eddyb

@bors
Copy link
Contributor

bors commented Apr 29, 2016

⌛ Testing commit 6074463 with merge 2abf281...

bors added a commit that referenced this pull request Apr 29, 2016
debuginfo: Fix regression in namespace handling for struct types.

Fixes a small regression that has been introduced in recent refactorings.

Fixes #33193

r? @eddyb
@bors
Copy link
Contributor

bors commented Apr 29, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Apr 28, 2016 at 8:41 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-64-opt-rustbuild
http://buildbot.rust-lang.org/builders/auto-mac-64-opt-rustbuild/builds/907


You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#33225 (comment)

@bors
Copy link
Contributor

bors commented Apr 29, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@michaelwoerister
Copy link
Member Author

test [codegen-units] codegen-units/partitioning/extern-generic.rs ... FAILED
...
error: unable to delete old dep-graph at tmp/dep_graph.rbml: No such file or directory (os error 2)

Hm, #33171 might have introduced a race condition into the test setup...

@alexcrichton
Copy link
Member

@bors
Copy link
Contributor

bors commented May 1, 2016

⌛ Testing commit 6074463 with merge 7163ed8...

@bors
Copy link
Contributor

bors commented May 1, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@michaelwoerister michaelwoerister force-pushed the fix-debuginfo-struct-ns branch from 6074463 to 4230353 Compare May 2, 2016 03:45
@michaelwoerister
Copy link
Member Author

Removed the unit-struct case which seems to cause trouble for the LLDB version on the buildbots.

@michaelwoerister
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Contributor

bors commented May 2, 2016

📌 Commit 4230353 has been approved by eddyb

@bors
Copy link
Contributor

bors commented May 2, 2016

⌛ Testing commit 4230353 with merge 1b60e32...

bors added a commit that referenced this pull request May 2, 2016
debuginfo: Fix regression in namespace handling for struct types.

Fixes a small regression that has been introduced in recent refactorings.

Fixes #33193

r? @eddyb
@bors
Copy link
Contributor

bors commented May 2, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@alexcrichton
Copy link
Member

@alexcrichton
Copy link
Member

@bors: retry-

Actually, this may not be spurious, I'll defer to you though :)

@michaelwoerister
Copy link
Member Author

error: line not found in debugger output: (struct_namespace::Struct1) $0 = [...]

The strange thing is, the line is right there in the output below... I'll look into it.

Manishearth added a commit to Manishearth/rust that referenced this pull request May 2, 2016
…ct-ns, r=eddyb

debuginfo: Fix regression in namespace handling for struct types.

Fixes a small regression that has been introduced in recent refactorings.

Fixes rust-lang#33193

r? @eddyb
bors added a commit that referenced this pull request May 2, 2016
Rollup of 14 pull requests

- Successful merges: #32756, #33129, #33225, #33260, #33309, #33320, #33323, #33324, #33325, #33330, #33332, #33334, #33335, #33346
- Failed merges:
@Manishearth
Copy link
Member

http://buildbot.rust-lang.org/builders/auto-mac-64-opt-rustbuild/builds/957/steps/test/logs/stdio


failures:

---- [debuginfo-lldb] debuginfo-lldb/struct-namespace.rs stdout ----
    NOTE: compiletest thinks it is using LLDB version 330

error: line not found in debugger output: (struct_namespace::Struct1) $0 = [...]
status: exit code: 0
command: "/usr/bin/python" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/src/etc/lldb_batchmode.py" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo/struct-namespace.stage2-x86_64-apple-darwin" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo/struct-namespace.debugger.script"
stdout:
------------------------------------------
LLDB batch-mode script
----------------------
Debugger commands script is '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo/struct-namespace.debugger.script'.
Target executable is '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo/struct-namespace.stage2-x86_64-apple-darwin'.
Current working directory is '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj'
Creating a target for '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo/struct-namespace.stage2-x86_64-apple-darwin'
settings set auto-confirm true

version
lldb-330.0.48 
command script import /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/./src/etc/lldb_rust_formatters.py
type summary add --no-value --python-function lldb_rust_formatters.print_val -x ".*" --category Rust
type category enable Rust

breakpoint set --file 'struct-namespace.rs' --line 66
Breakpoint 1: where = struct-namespace.stage2-x86_64-apple-darwin`struct_namespace::main + 70 at struct-namespace.rs:66, address = 0x0000000100000e66 
run
Hit breakpoint 1.1: where = struct-namespace.stage2-x86_64-apple-darwin`struct_namespace::main + 70 at struct-namespace.rs:66, address = 0x0000000100000e66, resolved, hit count = 1 
Process 58804 stopped * thread #1: tid = 0x20d4ef9, 0x0000000100000e66 struct-namespace.stage2-x86_64-apple-darwin`struct_namespace::main + 70 at struct-namespace.rs:66, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1 frame #0: 0x0000000100000e66 struct-namespace.stage2-x86_64-apple-darwin`struct_namespace::main + 70 at struct-namespace.rs:66 63 64 let mod1_struct2 = mod1::Struct2(5); 65 -> 66 zzz(); // #break 67 } 68 69 #[inline(never)] Process 58804 launched: '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo/struct-namespace.stage2-x86_64-apple-darwin' (x86_64) 
p struct1
(struct_namespace::Struct1) $0 = Struct1 { a: 0, b: 1 } 
p struct2
(struct_namespace::Struct2) $1 = Struct2(2) 
p mod1_struct1
(struct_namespace::mod1::Struct1) $2 = Struct1 { a: 3, b: 4 } 
p mod1_struct2
(struct_namespace::mod1::Struct2) $3 = Struct2(5) 
quit


------------------------------------------
stderr:
------------------------------------------
2016-05-02 19:34:16.217 Python[58803:34426613] Metadata.framework [Error]: couldn't get the client port

------------------------------------------

thread '[debuginfo-lldb] debuginfo-lldb/struct-namespace.rs' panicked at 'explicit panic', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/src/tools/compiletest/src/runtest.rs:1595
note: Run with `RUST_BACKTRACE=1` for a backtrace.


failures:
    [debuginfo-lldb] debuginfo-lldb/struct-namespace.rs

test result: FAILED. 91 passed; 1 failed; 10 ignored; 0 measured

thread '<main>' panicked at 'Some tests failed', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/src/tools/compiletest/src/main.rs:275


command did not execute successfully: "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/compiletest" "--compile-lib-path" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2/lib" "--run-lib-path" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "--rustc-path" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2/bin/rustc" "--rustdoc-path" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/stage2/bin/rustdoc" "--src-base" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/src/test/debuginfo" "--aux-base" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/src/test/auxiliary" "--build-base" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/test/debuginfo" "--stage-id" "stage2-x86_64-apple-darwin" "--mode" "debuginfo-lldb" "--target" "x86_64-apple-darwin" "--host" "x86_64-apple-darwin" "--llvm-filecheck" "/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath" "--target-rustcflags" "-Crpath -Lnative=/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/obj/build/x86_64-apple-darwin/rust-test-helpers" "--android-cross-path" "" "--docck-python" "python" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-330.0.48" "--lldb-python-dir" "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" ""
expected success, got: exit code: 101

bors added a commit that referenced this pull request May 3, 2016
Rollup of 14 pull requests

- Successful merges: #32756, #33129, #33225, #33260, #33309, #33320, #33323, #33324, #33325, #33330, #33332, #33334, #33335, #33346
- Failed merges:
@bors
Copy link
Contributor

bors commented May 3, 2016

⌛ Testing commit 4230353 with merge c961493...

@bors
Copy link
Contributor

bors commented May 3, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@eddyb
Copy link
Member

eddyb commented May 3, 2016

@bors r+

@bors
Copy link
Contributor

bors commented May 3, 2016

📌 Commit bb0e525 has been approved by eddyb

@bors
Copy link
Contributor

bors commented May 6, 2016

⌛ Testing commit bb0e525 with merge 102bab3...

bors added a commit that referenced this pull request May 6, 2016
debuginfo: Fix regression in namespace handling for struct types.

Fixes a small regression that has been introduced in recent refactorings.

Fixes #33193

r? @eddyb
@bors bors merged commit bb0e525 into rust-lang:master May 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants