HomePhabricator

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

Authored by MatzeB on Feb 14 2017, 7:00 PM.

Description

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

Conflicts:
lib/Frontend/CompilerInvocation.cpp

apple-llvm-split-commit: 28b4d1677bccaa3659caffad8418e7bd861df9af
apple-llvm-split-dir: clang/