This is an automated email from the git hooks/post-receive script.

unknown user pushed a change to branch master in repository clang.

from 31a16c4f5b [CUDA] Work around conflicting function definitions in CUDA- [...] new 87d985aec9 Add support for remembering origins to ExternalASTMerger

The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.

Summary of changes: include/clang/AST/ExternalASTMerger.h | 139 ++++++- lib/AST/ExternalASTMerger.cpp | 402 ++++++++++++++++----- lib/Sema/SemaType.cpp | 14 +- test/Import/extern-c-function/Inputs/F.cpp | 3 + test/Import/extern-c-function/test.cpp | 4 + .../Import/forward-declared-objc-class/Inputs/S1.m | 1 + .../Import/forward-declared-objc-class/Inputs/S2.m | 6 + .../Import/forward-declared-objc-class/Inputs/S3.m | 1 + test/Import/forward-declared-objc-class/test.m | 6 + .../forward-declared-struct/Inputs/{S1.c => S3.c} | 0 test/Import/forward-declared-struct/test.c | 2 +- .../Inputs/Callee.cpp | 0 test/Import/local-struct-use-origins/test.cpp | 7 + test/Import/local-struct/test.cpp | 3 +- .../Inputs/S.m | 0 test/Import/objc-definitions-in-expression/test.m | 21 ++ test/Import/struct-and-var/Inputs/S1.cpp | 1 + test/Import/struct-and-var/Inputs/S2.cpp | 3 + test/Import/struct-and-var/test.cpp | 5 + test/Import/template/Inputs/T.cpp | 5 + test/Import/template/test.cpp | 4 + tools/clang-import-test/clang-import-test.cpp | 150 +++++--- 22 files changed, 611 insertions(+), 166 deletions(-) create mode 100644 test/Import/extern-c-function/Inputs/F.cpp create mode 100644 test/Import/extern-c-function/test.cpp create mode 100644 test/Import/forward-declared-objc-class/Inputs/S1.m create mode 100644 test/Import/forward-declared-objc-class/Inputs/S2.m create mode 100644 test/Import/forward-declared-objc-class/Inputs/S3.m create mode 100644 test/Import/forward-declared-objc-class/test.m copy test/Import/forward-declared-struct/Inputs/{S1.c => S3.c} (100%) copy test/Import/{local-struct => local-struct-use-origins}/Inputs/Callee.cpp (100%) create mode 100644 test/Import/local-struct-use-origins/test.cpp copy test/Import/{objc-method => objc-definitions-in-expression}/Inputs/S.m (100%) create mode 100644 test/Import/objc-definitions-in-expression/test.m create mode 100644 test/Import/struct-and-var/Inputs/S1.cpp create mode 100644 test/Import/struct-and-var/Inputs/S2.cpp create mode 100644 test/Import/struct-and-var/test.cpp create mode 100644 test/Import/template/Inputs/T.cpp create mode 100644 test/Import/template/test.cpp