review.tizen.org Git - platform/upstream/llvm.git/commit

projects / platform / upstream / llvm.git / commit

author	Douglas Gregor <dgregor@apple.com>
	Wed, 20 Mar 2013 21:10:35 +0000 (21:10 +0000)
committer	Douglas Gregor <dgregor@apple.com>
	Wed, 20 Mar 2013 21:10:35 +0000 (21:10 +0000)
commit	fb9126578ec3b320272da281ce60aa7cd11e8a06
tree	80741c94fb3866a65a264e1eaab661861bb0b165	tree \| snapshot
parent	f83a664a4074ef5b15a209d6c9fa17253bff7681	commit \| diff

<rdar://problem/12368093> Extend module maps with a 'conflict' declaration, and warn when a newly-imported module conflicts with an already-imported module.

llvm-svn: 177577

25 files changed:

clang/include/clang/Basic/DiagnosticGroups.td		diff \| blob \| history
clang/include/clang/Basic/DiagnosticLexKinds.td		diff \| blob \| history
clang/include/clang/Basic/DiagnosticSerializationKinds.td		diff \| blob \| history
clang/include/clang/Basic/Module.h		diff \| blob \| history
clang/include/clang/Frontend/ASTUnit.h		diff \| blob \| history
clang/include/clang/Frontend/CompilerInstance.h		diff \| blob \| history
clang/include/clang/Lex/ModuleLoader.h		diff \| blob \| history
clang/include/clang/Lex/ModuleMap.h		diff \| blob \| history
clang/include/clang/Serialization/ASTBitCodes.h		diff \| blob \| history
clang/include/clang/Serialization/ASTReader.h		diff \| blob \| history
clang/lib/Basic/Module.cpp		diff \| blob \| history
clang/lib/Frontend/CompilerInstance.cpp		diff \| blob \| history
clang/lib/Lex/ModuleMap.cpp		diff \| blob \| history
clang/lib/Sema/Sema.cpp		diff \| blob \| history
clang/lib/Sema/SemaDecl.cpp		diff \| blob \| history
clang/lib/Serialization/ASTReader.cpp		diff \| blob \| history
clang/lib/Serialization/ASTWriter.cpp		diff \| blob \| history
clang/test/Modules/Inputs/Conflicts/conflict_a.h	[new file with mode: 0644]	blob
clang/test/Modules/Inputs/Conflicts/conflict_b.h	[new file with mode: 0644]	blob
clang/test/Modules/Inputs/Conflicts/module.map	[new file with mode: 0644]	blob
clang/test/Modules/conflicts.m	[new file with mode: 0644]	blob
clang/unittests/Basic/SourceManagerTest.cpp		diff \| blob \| history
clang/unittests/Lex/LexerTest.cpp		diff \| blob \| history
clang/unittests/Lex/PPCallbacksTest.cpp		diff \| blob \| history
clang/unittests/Lex/PPConditionalDirectiveRecordTest.cpp		diff \| blob \| history

Domain: System / Toolchain;

RSS Atom