const_fn: Check the terminating expression of a block for blocks in a const initializer

[swgillespie]

In a const or static initializer, the CheckBlock check ensures that blocks in the initializer expression are only in tail positions or in items. In this case, it didn't check the terminating expression of a block, which resulted in an ICE later in the compiler pipeline if the trailing expression was itself a block. This change fixes the ICE and ensures that the proper error is emitted. This fixes the ICE in #32829 .

[rust-highfive]

r? @jroesch

(rust_highfive has picked a reviewer for you, use r? to override)

[bors]

☔ The latest upstream changes (presumably #33130) made this pull request unmergeable. Please resolve the merge conflicts.

[eddyb]

@swgillespie Can you rebase and check if these tests cause errors without any actual changes to the compiler? The approach taken in #33130 is a bit more general than the old checks.

[swgillespie]

@eddyb will do!

[swgillespie]

@eddyb This works fine with your changes so this PR is just a regression test now.

[eddyb]

@bors r+

[bors]

📌 Commit 2467d40 has been approved by eddyb

[bors]

⌛ Testing commit 2467d40 with merge 926cee0...

[bors]

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

[eddyb]

@swgillespie Aww, tidy failure.

[swgillespie]

@eddyb should be fixed now.

[eddyb]

@bors r+

[bors]

📌 Commit 94a0552 has been approved by eddyb

[bors]

⌛ Testing commit 94a0552 with merge bcf107c...

[bors]

💔 Test failed - auto-win-gnu-32-opt-rustbuild

[alexcrichton]

@bors: retry

• builder disappeared

On Wed, May 11, 2016 at 3:15 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-gnu-32-opt-rustbuild
http://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt-rustbuild/builds/1080

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

[bors]

⌛ Testing commit 94a0552 with merge ed1ece6...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild