HomePhabricator

Merge commit '339c153eef85d5fcaf74144bec341d2063d42cd0' into upstream-with-swift

Authored by friss on Dec 23 2016, 9:52 AM.

Description

Merge commit '339c153eef85d5fcaf74144bec341d2063d42cd0' into upstream-with-swift

Conflicts:
lib/Bitcode/Reader/MetadataLoader.cpp

apple-llvm-split-commit: 4542722885314c20e31087f8db4cdb8707fff146
apple-llvm-split-dir: llvm/