The original patch got reverted as a dependency ofcf1c774d6a. That patch got relanded so it's also necessary to reland this patch. Original summary: Aftercf1c774d6a, 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.