x86_64 ABI: Tweak merging algorithm so that we always bail early when

we see a Memory classification.

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

diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index 6ffe8c328ca23b7d69192cf6d9369eb8ecdcc4ec..afdf57a765090957283f2e8a7cd4e2ecdeabd91c 100644 (file)
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -548,13 +548,13 @@ void X86_64ABIInfo::classify(QualType Ty,
       //
       // (f) Otherwise class SSE is used.
       if (Target == FieldLo || FieldLo == NoClass) ;
-      else if (Target == NoClass)
-        Target = FieldLo;
       else if (FieldLo == Memory) {
         // Memory is never over-ridden, just bail.
         Lo = Memory;
         return;
       } 
+      else if (Target == NoClass)
+        Target = FieldLo;
       else if (Target == Integer || FieldLo == Integer) 
         Target = Integer;
       else if (FieldLo == X87 || FieldLo == X87Up || FieldLo == ComplexX87) {