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

Authored by anemet on Apr 6 2016, 8:54 AM.

Description

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

Conflicts:
include/clang/Basic/AttrDocs.td

apple-llvm-split-commit: 02c9abb95016f812091971a9f6f2b6dec202627b
apple-llvm-split-dir: clang/

Committed

anemet

Apr 6 2016, 8:54 AM

Parents

Branches

Unknown

Tags

Unknown

Commit		Author	Details	Committed
506f295a1099		ed	Enable PIE for CloudABI.	Apr 6 2016
406094728964		djasper	clang-format: Support labels in brace-less ifs.	Apr 6 2016
0dbd37543c5f		xazax.hun	[clang-tidy] Assertion fix in misc-misplaced-widening-cast check.	Apr 6 2016
5e34568f79b2		• rafael	Use a bit in SymbolBody to store CanKeepUndefined.	Apr 6 2016
4eaeacec6d4d	D18806	etienneb	[clang-tidy] filter plugins and plugin arguments of the command-line	Apr 6 2016

				Path	Packages
	M			clang-tools-extra/clang-tidy/ClangTidy.cpp
	M			clang-tools-extra/clang-tidy/misc/MisplacedWideningCastCheck.cpp
	M			clang/include/clang/AST/ASTMutationListener.h
	M			clang/include/clang/Basic/Attr.td
	M			clang/include/clang/Basic/AttrDocs.td
	M			clang/include/clang/Basic/DiagnosticGroups.td
	M			clang/include/clang/Basic/DiagnosticParseKinds.td
	M			clang/include/clang/Basic/DiagnosticSemaKinds.td
	M			clang/include/clang/Basic/OpenMPKinds.def
	M			clang/include/clang/Sema/Sema.h
	M			clang/include/clang/Serialization/ASTWriter.h
	M			clang/lib/AST/ASTContext.cpp
	M			clang/lib/AST/DeclPrinter.cpp
	M			clang/lib/Basic/OpenMPKinds.cpp
	M			clang/lib/Driver/ToolChains.h
	M			clang/lib/Driver/Tools.cpp
	M			clang/lib/Format/TokenAnnotator.cpp
	M			clang/lib/Format/UnwrappedLineParser.cpp
	M			clang/lib/Frontend/MultiplexConsumer.cpp
	M			clang/lib/Parse/ParseOpenMP.cpp
	M			clang/lib/Sema/SemaDecl.cpp
	M			clang/lib/Sema/SemaExpr.cpp
	M			clang/lib/Sema/SemaOpenMP.cpp
	M			clang/lib/Serialization/ASTCommon.h
	M			clang/lib/Serialization/ASTReaderDecl.cpp
	M			clang/lib/Serialization/ASTWriter.cpp
	M			clang/lib/Serialization/ASTWriterDecl.cpp
	M			clang/test/Driver/cloudabi.c
	M			clang/test/Driver/cloudabi.cpp
	A			clang/test/OpenMP/declare_target_ast_print.cpp
	A			clang/test/OpenMP/declare_target_messages.cpp
	M			clang/unittests/Format/FormatTest.cpp
	M			lld/ELF/Symbols.cpp
	M			lld/ELF/Symbols.h