HomePhabricator

Merge branch 'master' of http://llvm.org/git/clang into upstream-with-swift

Authored by ributzka on Sep 29 2017, 2:59 PM.

Description

Merge branch 'master' of http://llvm.org/git/clang into upstream-with-swift

Conflicts:
test/Misc/pragma-attribute-supported-attributes-list.test

apple-llvm-split-commit: e85adbf00fdcb22e0b164e29a8d7fd91f063c559
apple-llvm-split-dir: clang/

Merged Changes

CommitAuthorDetailsCommitted
a82808115e03probinson
[PS4] Tidy up some debug-tuning v. triple decision-making. 
Sep 29 2017
3e08f66bb0f4D38303erichkeane
[Sema] Correct IUnknown to support Unknwnbase.h Header. 
Sep 29 2017