Merge pull request #137 from vedantk/swift-4.1-branch

[CGBlocks] Improve line info in backtraces containing *_helper_block