tree 0713ad7eab1dd33063a6daf62fe47337a24e10f5
parent 758eef5c1fc08d4eb61488d1e5d5889dd48e0689
parent b48c6637ee10a32e0e02a072031fc61bebc65488
author swift-ci <swift-ci@users.noreply.github.com> 1478823508 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1478823508 -0800

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

* origin/swift-3.1-branch:
  Updated ASTMerge/macro.m to use _Nullable.
  When the ASTImporter imports a source location, it avoids importing macro expansions by calling getSpellingLoc(). That's great in most cases, but for macros defined in the '<built-in>' source file, the source file is invalid and does not import correctly, causing an assertion failure (the assertion is Invalid SLocOffset or bad function choice).