HomePhabricator

Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift

Authored by jkorous on Sep 23 2019, 10:45 AM.

Description

Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift

  1. Conflicts:
  2. include/clang/Basic/DiagnosticGroups.td

apple-llvm-split-commit: 09de5961d7de065f794b5eabe042177f34454296
apple-llvm-split-dir: clang/

Merged Changes

CommitAuthorDetailsCommitted
4d51c6ff2311martong
[ASTImporter] Attempt to fix Windows buildbot test errors 
Sep 23 2019