The original patch got reverted as a dependency of cf1c774d6ace59c5adc9ab71b31e . That patch got relanded so it's also necessary to reland this patch. Original summary: After cf1c774d6ace59c5adc9ab71b31e762c1be695b1, Clang seems to generate code that is more similar to icc/Clang, so we can use the same line numbers for all compilers in this test.