Fix some filename related ICEs in rustc#13531

alexcrichton wants to merge 3 commits intorust-lang:masterrust-lang/rust:masterfrom

alexcrichton:fix-some-icesalexcrichton/rust:fix-some-icesCopy head branch name to clipboard