tree a0af392df1f830c8383a7098467109cfef3f00d7
parent 8a0bbf110076f2fd84b50d52939a52b4edbf79f9
parent 6646bc878a1b5cb896abe9bb2cb31dacac9d0135
author swift-ci <swift-ci@users.noreply.github.com> 1470247070 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1470247070 -0700

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

* origin/swift-3.0-branch:
  Fixup for the cherrypick of 4b0d2c12 (r277458) into clang-800. The lit test used "nullptr", which clang-800 complains about, so let's just use NULL instead.
  Follow-up for r277458: Update the tsan_mman_test.cc unit test.
  [tsan] Fix behavior of realloc(nullptr, 0) on Darwin