Merge r321459 and r322623 into the 6.0 branch

[DimitryAndric]

Bugzilla Link	35976
Resolution	FIXED
Resolved on	Jan 17, 2018 05:57
Version	6.0
OS	All
Blocks	#35152
CC	@emaste,@zmodem

Extended Description

Please merge the following asmparser related fixes into the 6.0 branch:

• https://reviews.llvm.org/rL321459 (fixes bug 35741)
• https://reviews.llvm.org/D42102 (fixes bug 35749 and bug 35831), not yet committed but I will update this bug then.

[DimitryAndric]

• https://reviews.llvm.org/D42102 has now been committed as https://reviews.llvm.org/rL322623.

[zmodem]

r321459 landed before the branch.

r322623 I've merged in r322654.