tree 45cab6a7719eff1f371098345ab1efd9721e68a3
parent 41b864a2464e341c53cbdaa206b7cdc381ea0762
parent d4e8c75d6224bafdac6c8c48de5061fad29cce37
author swift-ci <swift-ci@users.noreply.github.com> 1464807313 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1464807313 -0700

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

* origin/swift-3.0-branch:
  PCH + module: make sure we write out macros associated with builtin identifiers.
  ObjC lifetime: pull sugar off when the qualifiers conflict.