tree e65cd82e60b77c70147ffb9de3d6c0b4668e2965
parent efa4fd54cfc3889d31a66d23dd8dd7e8a0278b2f
parent 3ebf7ebec70461a62c1bc1cf0fd0c7b3846c5f17
author swift-ci <swift-ci@users.noreply.github.com> 1478563628 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1478563628 -0800

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

* origin/swift-3.1-branch:
  Fix spelling mistake.
  [Sema] Avoid instantiating templates only when UncompilableErrorOccurred and FatalErrorOccurred are both set.
  Revert "[index] Handle properly C++14's template variables."