diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-08-26 23:29:11 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-08-26 23:29:11 +0000 |
commit | b1108739e47e0e84e6e50225a6032676c2121873 (patch) | |
tree | ae2252f5f98ec91f24ded991a5d423902d29b0f0 /clang/test/Modules/cxx-decls.cpp | |
parent | 689cdb189400f06fda1404933d13d3baf171fc59 (diff) | |
download | bcm5719-llvm-b1108739e47e0e84e6e50225a6032676c2121873.tar.gz bcm5719-llvm-b1108739e47e0e84e6e50225a6032676c2121873.zip |
[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.
llvm-svn: 216503
Diffstat (limited to 'clang/test/Modules/cxx-decls.cpp')
-rw-r--r-- | clang/test/Modules/cxx-decls.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/test/Modules/cxx-decls.cpp b/clang/test/Modules/cxx-decls.cpp index 678f245ed10..ee196cfc33b 100644 --- a/clang/test/Modules/cxx-decls.cpp +++ b/clang/test/Modules/cxx-decls.cpp @@ -33,10 +33,13 @@ int importMergeUsedFlag = getMergeUsedFlag(); int use_name_for_linkage(NameForLinkage &nfl) { return nfl.n + nfl.m; } +int use_overrides_virtual_functions(OverridesVirtualFunctions ovf) { return 0; } @import cxx_decls_merged; int name_for_linkage_test = use_name_for_linkage(name_for_linkage); +int overrides_virtual_functions_test = + use_overrides_virtual_functions(overrides_virtual_functions); // CHECK: VarDecl [[mergeUsedFlag:0x[0-9a-f]*]] {{.*}} in cxx_decls.imported used mergeUsedFlag // CHECK: VarDecl {{0x[0-9a-f]*}} prev [[mergeUsedFlag]] {{.*}} in cxx_decls_merged used mergeUsedFlag |