Merge r347261 and maybe r347262 into the 7.0 branch (Clang coverage crash fixes)

[orivej]

Bugzilla Link	39740
Resolution	FIXED
Resolved on	Nov 28, 2018 12:04
Version	7.0
OS	Linux
Blocks	#38454
CC	@tstellar,@vedantk
Fixed by commit(s)	r347261 r347262 r347797 r347798

Extended Description

https://reviews.llvm.org/rL347261 is needed because it fixes a regression reported in #38335

https://reviews.llvm.org/rL347262 may be merged at the discretion of the code owners and release managers because it fixes the last known crash in Clang coverage.

[orivej]

assigned to @tstellar

[tstellar]

Richard, what do you think about these? I can try to find another review for the code coverage fix if you aren't familiar with that code.

[zygoloid]

Both patches are fine for backporting.

[tstellar]

Merged: r347797 r347798

[orivej]

mentioned in issue llvm/llvm-bugzilla-archive#39822