diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-01-29 08:35:40 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-01-29 08:35:40 +0000 |
| commit | 7f102f8c815a38e7df72b7d032c31529b98047f7 (patch) | |
| tree | 279adc3fb98e739ecb27652a459dc286e962d731 /lib/CodeGen/CGCall.cpp | |
| parent | cc039fea2e985214e00387ce7404d358f56cf301 (diff) | |
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
Diffstat (limited to 'lib/CodeGen/CGCall.cpp')
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 6ffe8c328c..afdf57a765 100644 --- 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) { |