This is necessary since SVN r330706, as tail merging can include CFI instructions since then.
This fixes PR40322 and PR40012.
lgtm
@tstellar Can we have this merged into 8.0.1?