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

* origin/swift-4.0-branch:
  Revert "[ubsan] Sanity-check shift amounts before truncation (fixes PR27271)"
  Remove and replace DiagStatePoint tracking and lookup data structure.
  [Basic] Remove source manager references from diag state points.