Needed to properly map a file's first line to itself in the absence of a directive. We were also off by two columns due to a stray +2 Swift SVN r15682
Diagnostic output from compiling .swift files is now passed through the line-directive tool so that errors point back at the original .gyb files. Swift SVN r15674
Swift SVN r15344