]> granicus.if.org Git - clang/commit
[modules] Don't assert when merging virtual functions that override other
authorRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 26 Aug 2014 23:29:11 +0000 (23:29 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 26 Aug 2014 23:29:11 +0000 (23:29 +0000)
commite1b1adc8bd32db2fc0c9f4b24bd57ffe5dcc2d04
tree36b39d54ccfa936e8a96a2647d2d69bd6cc8ba80
parent3c002deeb1e5f315d728f885da7cfd46417423c8
[modules] Don't assert when merging virtual functions that override other
functions. Also don't needlessly pull in non-canonical declarations of the
overridden virtual functions.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@216503 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Serialization/ASTReaderDecl.cpp
test/Modules/Inputs/cxx-decls-imported.h
test/Modules/Inputs/cxx-decls-merged.h
test/Modules/cxx-decls.cpp