about summary refs log tree commit diff
path: root/src/rustllvm/ExecutionEngineWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-11 19:48:54 -0700
committerbors <bors@rust-lang.org>2016-05-11 19:48:54 -0700
commited1ece6fd8e9980501556a3c85365c7e29202975 (patch)
tree3c370617f22c62f843a0c57d58b7f6225e87dba0 /src/rustllvm/ExecutionEngineWrapper.cpp
parent22ac88f1a47a82195a49fbff3cf24a2c395d7a81 (diff)
parent94a055263eb96bf7f692854a0d16ade2f65d3b27 (diff)
downloadrust-ed1ece6fd8e9980501556a3c85365c7e29202975.tar.gz
rust-ed1ece6fd8e9980501556a3c85365c7e29202975.zip
Auto merge of #33169 - swgillespie:issue32829, r=eddyb
const_fn: Check the terminating expression of a block for blocks in a const initializer

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 .
Diffstat (limited to 'src/rustllvm/ExecutionEngineWrapper.cpp')
0 files changed, 0 insertions, 0 deletions