HomePhabricator

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

Authored by anemet on Apr 7 2016, 11:05 AM.

Description

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

Conflicts:
include/clang/Frontend/CompilerInvocation.h

apple-llvm-split-commit: 8344241b98c34d8034d590e4cdbeede39a346185
apple-llvm-split-dir: clang/

Merged Changes

CommitAuthorDetailsCommitted
94cfc603d189compnerd
Basic: move CodeGenOptions from Frontend 
Apr 7 2016