tree 51f967d94df483879180660f3dc29ab6cf66b5b7
parent ad9638a8372b528b98567f7945b14c64e6b622ad
parent 7d6e1849b32619242a174183b34e4beeda80ecdb
author swift-ci <swift-ci@users.noreply.github.com> 1486054533 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1486054533 -0800

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

* origin/swift-4.0-branch:
  [index] Provide a more general index::generateUSRForMacro() that doesn't depend on having a PreprocessingRecord.