tree 88f7c422c9914473a3a2bc4407f63eac9d1fbc68
parent 8018bf570602a75c86155513a6d33b8797744788
parent f86e56b7fbf11fed169eb3e300ac72c6b9d190fe
author swift-ci <swift-ci@users.noreply.github.com> 1481708549 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1481708549 -0800

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

* origin/swift-3.1-branch:
  Revert "Add support for __builtin_os_log_format[_buffer_size]"
  Revert "test/CodeGen/builtins.c: reinstate #ifdef __x86_64__ around __builtin_longjmp"
  Revert "Fix test on non-X86 platforms"
  Revert "Fix handling of %% format specifier in os_log builtins."
  Revert "Fix diagnostic format string for err_os_log_argument_to_big"