Merge r321779 into the 6.0 branch: #35045 : Convert injected-class-name to its corresponding simple-template-id

[StephanTLavavej]

Bugzilla Link	35817
Resolution	FIXED
Resolved on	Jan 17, 2018 08:16
Version	6.0
OS	Windows NT
Blocks	#35152
CC	@zmodem

Extended Description

Please consider merging https://reviews.llvm.org/rL321779 into Clang 6, in order to fix #34393 "Class template argument deduction mishandles std::chrono::time_point".

This bug affects MSVC's STL, which has a workaround in its test suite, and will probably affect libc++ too. It's a pretty small bug, but the fix is also small.

[zmodem]

Merged in r322677.