From 4bd0ca0a2f7ed432d3135a37dbb89e67bf4beb78 Mon Sep 17 00:00:00 2001
From: Richard Trieu <rtrieu@google.com>
Date: Fri, 9 Jun 2017 23:03:40 +0000
Subject: [PATCH] Revert r305110 to fix buildbot
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@305130 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/AST/ODRHash.cpp | 20 +-------------------
test/Modules/odr_hash.cpp | 18 ------------------
2 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/lib/AST/ODRHash.cpp b/lib/AST/ODRHash.cpp
index b260bad9d37..08593da89bb 100644
--- a/lib/AST/ODRHash.cpp
+++ b/lib/AST/ODRHash.cpp
@@ -140,25 +140,7 @@ void ODRHash::AddTemplateName(TemplateName Name) {
}
}
-void ODRHash::AddTemplateArgument(TemplateArgument TA) {
- auto Kind = TA.getKind();
- ID.AddInteger(Kind);
-
- switch (Kind) {
- case TemplateArgument::Null:
- case TemplateArgument::Declaration:
- case TemplateArgument::NullPtr:
- case TemplateArgument::Integral:
- case TemplateArgument::Template:
- case TemplateArgument::TemplateExpansion:
- case TemplateArgument::Expression:
- case TemplateArgument::Pack:
- break;
- case TemplateArgument::Type:
- AddQualType(TA.getAsType());
- break;
- }
-}
+void ODRHash::AddTemplateArgument(TemplateArgument TA) {}
void ODRHash::AddTemplateParameterList(const TemplateParameterList *TPL) {}
void ODRHash::clear() {
diff --git a/test/Modules/odr_hash.cpp b/test/Modules/odr_hash.cpp
index fb7005be259..a6a0b74743a 100644
--- a/test/Modules/odr_hash.cpp
+++ b/test/Modules/odr_hash.cpp
@@ -900,24 +900,6 @@ S2 s2;
#endif
}
-namespace TemplateArgument {
-#if defined(FIRST)
-template<typename> struct U1 {};
-struct S1 {
- U1<int> u;
-};
-#elif defined(SECOND)
-template<typename> struct U1 {};
-struct S1 {
- U1<double> u;
-};
-#else
-S1 s1;
-// expected-error@first.h:* {{'TemplateArgument::S1::u' from module 'FirstModule' is not present in definition of 'TemplateArgument::S1' in module 'SecondModule'}}
-// expected-note@second.h:* {{declaration of 'u' does not match}}
-#endif
-}
-
// Interesting cases that should not cause errors. struct S should not error
// while struct T should error at the access specifier mismatch at the end.
namespace AllDecls {
--
GitLab