From: Richard Trieu <rtrieu@google.com>
Date: Thu, 16 Feb 2017 05:48:25 +0000 (+0000)
Subject: Loosen a Type check ODR checking to try to fix the build bot.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b85388c4adfefeb678179de796ac328b1b9ecc53;p=clang

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 e2486de4c2..30e40cd915 100644
--- 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;
         }