Skip to content

Rollup of 6 pull requests #72877

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

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7750357
Return early to avoid ICE
JohnTitor May 30, 2020
2d4b09a
[AVR] Add AVR platform support
shepmaster May 6, 2016
a42bf5a
[AVR] Fix debug printing of function pointers
dylanmckay Jun 8, 2019
208adf9
[AVR] Add required references for AVR to the parser test suites
dylanmckay Mar 3, 2020
94a94d7
[AVR] Raise and link to a tracking issue for the `avr-interrupt` call…
dylanmckay Mar 3, 2020
717268c
[AVR] Re-bless the UI tests
dylanmckay Mar 4, 2020
737c342
[AVR] Update the compiletest library to recognize AVR as a 16-bit target
dylanmckay Mar 5, 2020
94ece5e
[AVR] Re-bless the 'test/ui/symbol-names' tests
dylanmckay Mar 5, 2020
cd890ff
[AVR] Remove AVR-specific logic from libstd
dylanmckay Apr 1, 2020
6260bc4
[AVR] Rename the 'none_base' target spec module to 'freestanding_base'
dylanmckay Apr 1, 2020
491bf8c
[AVR] Update ABI type classification logic to match the the AVR-Clang…
dylanmckay May 17, 2020
f6dfbbb
On recursive ADT, provide indirection structured suggestion
estebank May 29, 2020
c209040
review comments: only suggest one substitution
estebank May 31, 2020
5707838
validate basic sanity for TerminatorKind
RalfJung May 31, 2020
e07e424
replace DUMMY_SP by proper span
RalfJung May 31, 2020
9a4bdbf
more checks for SwitchInt
RalfJung May 31, 2020
f793c0b
always print MIR Location when validator finds a problem
RalfJung May 31, 2020
717fd66
Make `SourceMap` available for early debug-printing of `Span`s
Aaron1011 May 26, 2020
aa5d29f
bump Miri, update for cargo-miri being a separate project
RalfJung May 31, 2020
f019526
Rollup merge of #69478 - avr-rust:avr-support-upstream, r=jonas-schie…
RalfJung Jun 1, 2020
54ca0f2
Rollup merge of #72618 - Aaron1011:feature/early-sourcemap, r=petroch…
RalfJung Jun 1, 2020
ceb26de
Rollup merge of #72740 - estebank:recursive-indirection, r=matthewjasper
RalfJung Jun 1, 2020
11c0fbb
Rollup merge of #72775 - JohnTitor:await-sugg, r=estebank
RalfJung Jun 1, 2020
412910e
Rollup merge of #72779 - RalfJung:miri, r=oli-obk
RalfJung Jun 1, 2020
6e916b7
Rollup merge of #72810 - RalfJung:mir-terminate-sanity, r=jonas-schie…
RalfJung Jun 1, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[AVR] Re-bless the 'test/ui/symbol-names' tests
Adding a new ABI changes the hashes of all previous ABIs.

Fix suggested by @shepmaster in
#69478 (comment).
  • Loading branch information
dylanmckay committed May 30, 2020
commit 94ece5e80c345588243fac0b175ddabf5590d28a
4 changes: 2 additions & 2 deletions src/test/ui/symbol-names/basic.legacy.stderr
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
error: symbol-name(_ZN5basic4main17h81759b0695851718E)
error: symbol-name(_ZN5basic4main17h7bbff4a01206d8c2E)
--> $DIR/basic.rs:8:1
|
LL | #[rustc_symbol_name]
| ^^^^^^^^^^^^^^^^^^^^

error: demangling(basic::main::h81759b0695851718)
error: demangling(basic::main::h7bbff4a01206d8c2)
--> $DIR/basic.rs:8:1
|
LL | #[rustc_symbol_name]
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/symbol-names/impl1.legacy.stderr
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
error: symbol-name(_ZN5impl13foo3Foo3bar17h92cf46db76791039E)
error: symbol-name(_ZN5impl13foo3Foo3bar17hf9d7d0e61617a4b8E)
--> $DIR/impl1.rs:16:9
|
LL | #[rustc_symbol_name]
| ^^^^^^^^^^^^^^^^^^^^

error: demangling(impl1::foo::Foo::bar::h92cf46db76791039)
error: demangling(impl1::foo::Foo::bar::hf9d7d0e61617a4b8)
--> $DIR/impl1.rs:16:9
|
LL | #[rustc_symbol_name]
Expand All @@ -22,13 +22,13 @@ error: def-path(foo::Foo::bar)
LL | #[rustc_def_path]
| ^^^^^^^^^^^^^^^^^

error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h90c4a800b1aa0df0E)
error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h6435cd4293f0ad82E)
--> $DIR/impl1.rs:34:9
|
LL | #[rustc_symbol_name]
| ^^^^^^^^^^^^^^^^^^^^

error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::h90c4a800b1aa0df0)
error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::h6435cd4293f0ad82)
--> $DIR/impl1.rs:34:9
|
LL | #[rustc_symbol_name]
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/symbol-names/impl1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//[legacy]compile-flags: -Z symbol-mangling-version=legacy
//[v0]compile-flags: -Z symbol-mangling-version=v0
//[legacy]normalize-stderr-32bit: "h5ef5dfc14aeecbfc" -> "SYMBOL_HASH"
//[legacy]normalize-stderr-64bit: "h9e54d216f70fcbc5" -> "SYMBOL_HASH"
//[legacy]normalize-stderr-64bit: "hd9e82dc29c74d643" -> "SYMBOL_HASH"

#![feature(optin_builtin_traits, rustc_attrs)]
#![allow(dead_code)]
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/symbol-names/issue-60925.legacy.stderr
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17hc86312d25b60f6eeE)
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17h91943b9c102410e4E)
--> $DIR/issue-60925.rs:22:9
|
LL | #[rustc_symbol_name]
| ^^^^^^^^^^^^^^^^^^^^

error: demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo::hc86312d25b60f6ee)
error: demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo::h91943b9c102410e4)
--> $DIR/issue-60925.rs:22:9
|
LL | #[rustc_symbol_name]
Expand Down
6 changes: 6 additions & 0 deletions src/tools/compiletest/src/header/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ fn test_parse_normalization_string() {
let first = parse_normalization_string(&mut s);
assert_eq!(first, Some("something (32 bits)".to_owned()));
assert_eq!(s, " -> \"something ($WORD bits).");

// Nothing to normalize (No quotes, 16-bit)
let mut s = "normalize-stderr-16bit: something (16 bits) -> something ($WORD bits).";
let first = parse_normalization_string(&mut s);
assert_eq!(first, None);
assert_eq!(s, r#"normalize-stderr-16bit: something (16 bits) -> something ($WORD bits)."#);
}

fn config() -> Config {
Expand Down