summaryrefslogtreecommitdiffstats
path: root/clang/lib/Serialization
diff options
context:
space:
mode:
authorRichard Trieu <rtrieu@google.com>2017-02-16 05:48:25 +0000
committerRichard Trieu <rtrieu@google.com>2017-02-16 05:48:25 +0000
commit2700dc1302a1395395df7f4d40818475f60dcaee (patch)
tree7e72bd174c7d32bbd4afef59ba59115a033d735f /clang/lib/Serialization
parent63524f56f183e9d9eef0fe50fdcc934d92789967 (diff)
downloadbcm5719-llvm-2700dc1302a1395395df7f4d40818475f60dcaee.tar.gz
bcm5719-llvm-2700dc1302a1395395df7f4d40818475f60dcaee.zip
Loosen a Type check ODR checking to try to fix the build bot.
llvm-svn: 295286
Diffstat (limited to 'clang/lib/Serialization')
-rw-r--r--clang/lib/Serialization/ASTReader.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index e2486de4c23..30e40cd9157 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/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;
}
OpenPOWER on IntegriCloud