addr2line: update to match newer binutils

[philipc]

Somewhere between version 2.22 and 2.30, the binutils addr2line output for unknown lines changed from "??:0" to "??:?".

@kentfredric Can you check this fixes the tests for you?

[coveralls]

Coverage remained the same at 81.688% when pulling e318d76 on philipc:output-equiv into bc9ffed on gimli-rs:master.

[kentfredric]

Still failing in the same way:

addr2line $ git checkout pull/155/head
RUSTFLAGS=" -Cdebuginfo=2 -Copt-level=3" cargo +system test
...
$ addr2line -af --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca
__rust_maybe_catch_panic
??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -af --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca
__rust_maybe_catch_panic
??:0



', tests/output_equivalence.rs:82:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
Fthread 'addr2line -ai' panicked at 'Output not equivalent:

output_equivalence-95ef2c7b90dc37a8.gz

[philipc]

Thanks for testing, I've force pushed another change that should fix it.

[kentfredric]

Better, the "??:?" lines are fixed.

But the remaining diff shows an "at" on one side, and not the other.

$ addr2line -aipf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -aipf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
Fthread 'addr2line -aipsf' panicked at 'Output not equivalent:

$ addr2line -aipsf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -aipsf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
F...thread 'addr2line -apf' panicked at 'Output not equivalent:

$ addr2line -apf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -apf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
Fthread 'addr2line -apsf' panicked at 'Output not equivalent:

$ addr2line -apsf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -apsf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
0x00000000000618ca: __rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
F........thread 'addr2line -ipf' panicked at 'Output not equivalent:

$ addr2line -ipf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -ipf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
Fthread 'addr2line -ipsf' panicked at 'Output not equivalent:

$ addr2line -ipsf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -ipsf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
F...thread 'addr2line -pf' panicked at 'Output not equivalent:

$ addr2line -pf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -pf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
F...thread 'addr2line -psf' panicked at 'Output not equivalent:

$ addr2line -psf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic at ??:?

$ /home/kent/rust/forks/addr2line/target/debug/examples/addr2line -psf --exe /home/kent/rust/forks/addr2line/target/debug/deps/output_equivalence-95ef2c7b90dc37a8 0x134d7 0x136fa 0x33b69 0x302ac 0x618ca
__rust_maybe_catch_panic ??:?



', tests/output_equivalence.rs:82:9
F
failures:

failures:
    addr2line -aipf
    addr2line -aipsf
    addr2line -apf
    addr2line -apsf
    addr2line -ipf
    addr2line -ipsf
    addr2line -pf
    addr2line -psf

[philipc]

Ok, that "at" should be fixed now too.

[kentfredric]

Tests now passing:

git checkout pull/155/head

kent@katipo2 ~/rust/forks/addr2line $ RUSTFLAGS=" -Cdebuginfo=2 -Copt-level=3" cargo +system test
   Compiling addr2line v0.10.0 (/home/kent/rust/forks/addr2line)
    Finished dev [unoptimized + debuginfo] target(s) in 40.71s
     Running target/debug/deps/addr2line-8adb8f4e84f8c5db

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

     Running target/debug/deps/correctness-f8d2cef7e4a3e47c

running 3 tests
test zero_function ... ok
test zero_sequence ... ok
test correctness ... ok

test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

     Running target/debug/deps/output_equivalence-95ef2c7b90dc37a8

running 32 tests
................................
test result: ok. 32 passed; 0 failed; 0 ignored; 0 measured

     Running target/debug/deps/parse-f054c0845459b407

running 6 tests
test parse_base_slice ... ok
test parse_base_rc ... ok
test parse_functions_slice ... ok
test parse_lines_slice ... ok
test parse_lines_rc ... ok
test parse_functions_rc ... ok

test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

   Doc-tests addr2line

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

[philipc]

Thanks for testing!