summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/merge-using-decls.cpp
diff options
context:
space:
mode:
authorSam McCall <sam.mccall@gmail.com>2017-01-31 08:24:40 +0000
committerSam McCall <sam.mccall@gmail.com>2017-01-31 08:24:40 +0000
commit61e29aafa7a4609d53be92c258749377c5439320 (patch)
tree6389fc8d77252bbfa52d4a6a90945639d5a96768 /clang/test/Modules/merge-using-decls.cpp
parent651cfe3cfacade3fe010e41ed880f65f582e440e (diff)
downloadbcm5719-llvm-61e29aafa7a4609d53be92c258749377c5439320.tar.gz
bcm5719-llvm-61e29aafa7a4609d53be92c258749377c5439320.zip
Revert r293585 "Add better ODR checking for modules."
We're seeing what we believe are false positives. (It's hard to tell with the available diagnostics, and I'm not sure how to reduce them yet). I'll send Richard reproduction details offline. djasper/chandlerc suggested this should be a warning for now, to make rolling it out feasible. llvm-svn: 293611
Diffstat (limited to 'clang/test/Modules/merge-using-decls.cpp')
-rw-r--r--clang/test/Modules/merge-using-decls.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/clang/test/Modules/merge-using-decls.cpp b/clang/test/Modules/merge-using-decls.cpp
index 4153d14207c..98989d12f98 100644
--- a/clang/test/Modules/merge-using-decls.cpp
+++ b/clang/test/Modules/merge-using-decls.cpp
@@ -37,10 +37,6 @@ template int UseAll<Y>();
// Here, we're instantiating the definition from 'A' and merging the definition
// from 'B' into it.
-// expected-error@b.h:* {{'D::type' from module 'B' is not present in definition of 'D<T>' in module 'A'}}
-// expected-error@b.h:* {{'D::value' from module 'B' is not present in definition of 'D<T>' in module 'A'}}
-
-
// expected-error@b.h:* {{'E::value' from module 'B' is not present in definition of 'E<T>' in module 'A'}}
// expected-error@b.h:* {{'E::v' from module 'B' is not present in definition of 'E<T>' in module 'A'}}
OpenPOWER on IntegriCloud