[cfe-commits] r63295 - /cfe/trunk/lib/CodeGen/CGCall.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Jan 29 02:35:40 2009
New Revision: 63295

URL: http://llvm.org/viewvc/llvm-project?rev=63295&view=rev
Log:
x86_64 ABI: Tweak merging algorithm so that we always bail early when
we see a Memory classification.

Modified:
    cfe/trunk/lib/CodeGen/CGCall.cpp

Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=63295&r1=63294&r2=63295&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Thu Jan 29 02:35:40 2009
@@ -548,13 +548,13 @@
       //
       // (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) {