r305130 - Revert r305110 to fix buildbot

[Richard Trieu via cfe-commits]

Author: rtrieu
Date: Fri Jun  9 18:03:40 2017
New Revision: 305130

URL: http://llvm.org/viewvc/llvm-project?rev=305130&view=rev
Log:
Revert r305110 to fix buildbot

Modified:
    cfe/trunk/lib/AST/ODRHash.cpp
    cfe/trunk/test/Modules/odr_hash.cpp

Modified: cfe/trunk/lib/AST/ODRHash.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ODRHash.cpp?rev=305130&r1=305129&r2=305130&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ODRHash.cpp (original)
+++ cfe/trunk/lib/AST/ODRHash.cpp Fri Jun  9 18:03:40 2017
@@ -140,25 +140,7 @@ void ODRHash::AddTemplateName(TemplateNa
   }
 }
 
-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() {

Modified: cfe/trunk/test/Modules/odr_hash.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/odr_hash.cpp?rev=305130&r1=305129&r2=305130&view=diff
==============================================================================
--- cfe/trunk/test/Modules/odr_hash.cpp (original)
+++ cfe/trunk/test/Modules/odr_hash.cpp Fri Jun  9 18:03:40 2017
@@ -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 at first.h:* {{'TemplateArgument::S1::u' from module 'FirstModule' is not present in definition of 'TemplateArgument::S1' in module 'SecondModule'}}
-// expected-note at 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 {