tree 0f6fde0481dcbc851e54c6d4d87ef0c6504ac21d
parent d87e1ea35a0530084faedbc716b13330d0e1d1e8
parent e12566a15173d869283184bb8ee2c9de7869c81a
author swift-ci <swift-ci@users.noreply.github.com> 1484325880 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1484325880 -0800

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

* origin/swift-3.1-branch:
  Fix a buildbot failure introduced by r290960.
  Add -f[no-]strict-return flag that can be used to avoid undefined behaviour in non-void functions that fall off at the end without returning a value when compiling C++.