Rust 1.17 regression - named-block 0.3.1

[alexcrichton]

   Compiling named-block v0.3.1 (file:///home/alex/code/named-block)
   Compiling static-cond v0.1.1
error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports

thread 'rustc' panicked at 'called `Option::unwrap()` on a `None` value', /checkout/src/libcore/option.rs:323
note: Run with `RUST_BACKTRACE=1` for a backtrace.

error: Could not compile `named-block`.

To learn more, run the command again with --verbose.

Only regresses against beta, fixed in nightly. Do we have a PR tagged with a backport to fix this?

[alexcrichton]

cc @rust-lang/compiler

[alexcrichton]

May also affect rustasm6502

cc @jonas-schievink

[alexcrichton]

Likely also uom

cc @iliekturtles

[durka]

cc me :)

[iliekturtles]

Looks like #40813. There are nested macro_rules! in static-cond. Since landing in nightly uom is building again.

[alexcrichton]

@jseyfried can you confirm #40813 fixes this? If so then we can close as that's nominated for a backport

[alexcrichton]

er, didn't mean to close yet

[durka]

I can confirm that cherry-picking #40813 on top of the beta branch fixes named-block.

[alexcrichton]

Thanks @durka!

In that case we'll track this with the other backports.