HomePhabricator

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

Authored by mzolotukhin on Jan 15 2018, 8:32 PM.

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

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

Conflicts:
unittests/libclang/LibclangTest.cpp

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

Merged Changes

CommitAuthorDetailsCommitted
d74b6a8f64fcgeorge.burgess.iv
[Sema] Fix a crash on invalid features in multiversioning 
Jan 15 2018
d57c03ddca1cmclow.lists
More constexpr algorithms from P0202: lower_bound, upper_bound, equal_range… 
Jan 15 2018
a38c495f2239mclow.lists
Actually CALL the constexpr tests. 
Jan 15 2018
6538e28d5dbcmclow.lists
More constexpr (re P0202) - equal and mismatch 
Jan 15 2018