Merge r318289 into the 5.0 branch : [DebugInfo] Fix potential CU mismatch for SubprogramScopeDIEs.

[tstellar]

Bugzilla Link	35331
Resolution	FIXED
Resolved on	Nov 17, 2017 10:48
Version	5.0
OS	All
Blocks	#33840
CC	@adrian-prantl,@JDevlieghere
Fixed by commit(s)	r318289 r318542

Extended Description

Is it OK to merge the following revision(s) to the 5.0 branch?

[tstellar]

assigned to @echristo

[tstellar]

https://reviews.llvm.org/rL318289

[adrian-prantl]

This is a fix the Rust folks care a lot about and not very risky, so this LGTM.

[JDevlieghere]

+1

[echristo]

Sure. Do it.

[tstellar]

Merged: r318542