HomePhabricator

Fix merge conflict in include/clang/Basic/Builtins.def

Authored by friss on Oct 3 2016, 5:53 PM.

Description

Fix merge conflict in include/clang/Basic/Builtins.def

apple-llvm-split-commit: 2b21102a9f3abc62459c0309258d3011f2697ae4
apple-llvm-split-dir: clang/

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
3e048bb1405aD25068GorNishanov
[coroutines] Switch to using std::experimental namespace per P0057R5 
Oct 3 2016
3a7318f4903aD25209modocache
[lit] Remove workaround for Python 2.5 
Oct 3 2016
bbae6a94e869zturner
Try to fix failing tests when running remote test suite. 
Oct 3 2016
038aadd87f15granata.enrico
Fix the data formatter for std::multiset in libc++ - this is a trivial amount… 
Oct 3 2016
b0590268c2c7vitalybuka
Support configurable path to LLVM src 
Oct 3 2016
74bed9d75759D24104efriedma
Make GlobalsAA ignore dead constant expressions. 
Oct 3 2016
396bfdd70763iteratee
Codegen: Tail-duplicate during placement. 
Oct 3 2016
da68203678e1mclow.lists
Mark a couple more Issaquah issues as done: 2578 and 2738 
Oct 3 2016
f2464a9301ffmclow.lists
Change a couple of 'template <typename's to 'template <class' which is what we… 
Oct 3 2016
53abcbd8a90cmclow.lists
Add tests to make sure that is_constructible<cv-void> is false. We already… 
Oct 3 2016
be3be28b5d5cgranata.enrico
Changes to the std::multimap formatter to make it work against trunk libc++ 
Oct 3 2016
5c28c66f237azturner
Modernize some code related to Args usage / implementation. 
Oct 3 2016
80ed86368de6george.burgess.iv
[MSSA] Allow unittests to use BasicAA when building. 
Oct 3 2016
691405be388fD25099zturner
Refactor the Args class. 
Oct 3 2016
44761a6e47f8tfiala
add a simple test case to validate test id() 
Oct 3 2016
97e3b6d895baD24373GorNishanov
[coroutines] Adding builtins for coroutine intrinsics and backendutil support. 
Oct 3 2016
e040533ecec5sunfish
[WebAssembly] Update to more stack-machine-oriented terminology. 
Oct 3 2016
ffc184bb1dd8sunfish
[WebAssemby] Clean up an obsolete comment. 
Oct 3 2016
1f49329e81fdD25173beanz
[lit] Use argparse instead of optparse 
Oct 3 2016
9baa3e80a9abMatzeB
TargetMachine: Make the win32-macho workaround more specific. 
Oct 3 2016
16fa0d81596esunfish
[WebAssembly] Delete an unused function. NFC. 
Oct 3 2016
d2fc0d40e4f0MatzeB
Set some tests to an unknown vendor and OS 
Oct 3 2016
762d68bbab8bmehdi_amini
[LTO] Fix test to not depend on the exact address of symbols, just their linkage 
Oct 3 2016
9850e87784c8sunfish
[WebAssembly] Fix indentation. NFC. 
Oct 3 2016
4b8e8becf658sunfish
[WebAssembly] Rename OPERAND_FP32IMM to OPERAND_F32IMM. 
Oct 3 2016
a0042c492268manmanren
ObjectiveC: fix a seg fault when deserialing redeclaration of ObjCMethodDecl. 
Oct 3 2016
3a06701913c7qcolombet
[AArch64][RegisterBankInfo] Add getSameKindofOperandsMapping. 
Oct 3 2016
c8b6ecabd802kparzysz
[RDF] Fix liveness propagation through shadows 
Oct 3 2016
a827ed8891bcMatzeB
AArch64Subtarget: Remove unused CPUString field 
Oct 3 2016
844ba8879e77dergachev.a
[analyzer] A blind attempt to fix a buildbot after r283092. 
Oct 3 2016
eccdee91960eD24627MatzeB
X86: Do not produce GOT relocations on windows 
Oct 3 2016
ab5478a9c669D25193zhaoqin
[esan] Fix ESan test failure on Debian Sid bot 
Oct 3 2016
c485b877be48D25205zturner
Add unit tests for StringSwitch. 
Oct 3 2016
0359a193a74dsanjoy
[PruneEH] Be correct in the face IPO 
Oct 3 2016
31dd377ffc1daizatsky
[sancov] using env for better portability 
Oct 3 2016
385f10152c91D25207ioeric
Added more comments to tooling::Replacements. 
Oct 3 2016
92abc7e9f22bD24168danielcdh
Refactor LICM pass in preparation for LoopSink pass. 
Oct 3 2016
60a83737789bkzhuravl
[AMDGPU] Pass optimization level to SelectionDAGISel 
Oct 3 2016
f33bfcb0e0b0rnk
Factor out a diagnostic kind enum for use in two %select expressions 
Oct 3 2016
691e2e020b1bkzhuravl
[AMDGPU] Sign extend AShr when promoting (instead of zero extending) 
Oct 3 2016
b4d2678c6f2cD24680hansw
Jump threading: avoid trying to split edge into landingpad block (PR27840) 
Oct 3 2016
2ee505e715c5zturner
Rename Error -> ReportError. 
Oct 3 2016
9ddfb04d03ba rafael
Revert "Use getSize instead of data().size(). NFC." 
Oct 3 2016
ab26e2dd3b09kparzysz
[RDF] Further improve readability of the graph 
Oct 3 2016
4bb425e84841 rafael
Use getSize instead of data().size(). NFC. 
Oct 3 2016
a5554a93dee1mclow.lists
Mark a couple issues as done (2742 and 2760) 
Oct 3 2016
cf6e83a626f6lhames
[RTDyld] Fix a bug in RTDyldMemoryManager::deregisterEHFrames. 
Oct 3 2016
a77fe4eef387kparzysz
[RDF] Replace RegisterAliasInfo with target-independent code using lane masks 
Oct 3 2016
53b000afc2bbjlebar
[CUDA] Clean up some comments in Sema::IsOverload. NFC 
Oct 3 2016
e060feb7b1a9D24571jlebar
[CUDA] Disallow overloading destructors. 
Oct 3 2016