Author: rtrieu Date: Wed Feb 15 23:48:25 2017 New Revision: 295286 URL: http://llvm.org/viewvc/llvm-project?rev=295286&view=rev Log: Loosen a Type check ODR checking to try to fix the build bot.
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp Modified: cfe/trunk/lib/Serialization/ASTReader.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=295286&r1=295285&r2=295286&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTReader.cpp (original) +++ cfe/trunk/lib/Serialization/ASTReader.cpp Wed Feb 15 23:48:25 2017 @@ -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; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits