tree 4f2ecfdc87d06640f09f157fd731dfd73f53faa2
parent ef415b8f615da8435b9a9c4c797b9f048b640a2d
parent 42e40163af3b8cd3d15725004dcff330ee8639d1
author swift-ci <swift-ci@users.noreply.github.com> 1468617798 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1468617798 -0700

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

* origin/swift-3.0-branch:
  [test/objcmt] Add a follow-up test case for r275600.
  [objcmt] Fix a buffer overflow crash than can occur while modernizing enums.
  [AST] Keep track of the left brace source location of a tag decl.
  [objcmt] Don't add an #import of Foundation unnecessarily, if the NS_ENUM macro is already defined.