Loosen a Type check ODR checking to try to fix the build bot.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@295286 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index e2486de4c23cad9390f0739263517f042fa4a518..30e40cd91576a2733ca4602e0b43f163c901f2dd 100644 (file)
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -9396,7 +9396,8 @@ void ASTReader::diagnoseOdrViolations() {
             break;
           }
 
-          if (FirstParam->getType() != SecondParam->getType()) {
+          if (!Context.hasSameType(FirstParam->getType(),
+                                   SecondParam->getType())) {
             ODRDiagError(FirstParam->getLocation(),
                          FirstParam->getSourceRange(), MethodParamType)
                 << SecondMD << i + 1 << FirstParam->getType();
@@ -9460,7 +9461,8 @@ void ASTReader::diagnoseOdrViolations() {
         }
 
         // This case is handled elsewhere.
-        if (FirstField->getType() != SecondField->getType()) {
+        if (!Context.hasSameType(FirstField->getType(),
+                                 SecondField->getType())) {
           break;
         }