x86_64 ABI: Need to use canonical types when comparing against
ASTContext types.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64533 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index debf131..708c717 100644
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -542,7 +542,7 @@
Hi = SSEUp;
}
} else if (const ComplexType *CT = Ty->getAsComplexType()) {
- QualType ET = CT->getElementType();
+ QualType ET = Context.getCanonicalType(CT->getElementType());
uint64_t Size = Context.getTypeSize(Ty);
if (ET->isIntegerType()) {
@@ -670,8 +670,12 @@
if (Ty->isIntegerType() || Ty->isPointerType())
return ABIArgInfo::getDirect();
} else if (CoerceTo == llvm::Type::DoubleTy) {
+ // FIXME: It would probably be better to make CGFunctionInfo only
+ // map using canonical types than to canonize here.
+ QualType CTy = Context.getCanonicalType(Ty);
+
// Float and double end up in a single SSE reg.
- if (Ty == Context.FloatTy || Ty == Context.DoubleTy)
+ if (CTy == Context.FloatTy || CTy == Context.DoubleTy)
return ABIArgInfo::getDirect();
}