[llvm-branch-commits] [llvm-gcc-branch] r88669 - /llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-abi.h

[Bob Wilson]

Author: bwilson
Date: Fri Nov 13 12:42:33 2009
New Revision: 88669

URL: http://llvm.org/viewvc/llvm-project?rev=88669&view=rev
Log:
$ svn merge -c 87052 https://bwilson@llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r87052 into '.':
U    gcc/llvm-abi.h

Modified:
    llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-abi.h

Modified: llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-abi.h?rev=88669&r1=88668&r2=88669&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-abi.h (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/gcc/llvm-abi.h Fri Nov 13 12:42:33 2009
@@ -629,18 +629,19 @@
       Elts.push_back(ATy);
     }
 
-    // Put any left over bytes into one last register.  This target-independent
-    // code does not know the size of the argument registers, so use the
-    // smallest size that will work.
-    if (Size > 4) {
-      Elts.push_back(Type::getInt64Ty(getGlobalContext()));
-    } else if (Size > 2) {
+    if (Size >= 4) {
       Elts.push_back(Type::getInt32Ty(getGlobalContext()));
-    } else if (Size > 1) {
+      Size -= 4;
+    }
+    if (Size >= 2) {
       Elts.push_back(Type::getInt16Ty(getGlobalContext()));
-    } else {
+      Size -= 2;
+    }
+    if (Size >= 1) {
       Elts.push_back(Type::getInt8Ty(getGlobalContext()));
+      Size -= 1;
     }
+    assert(Size == 0 && "Didn't cover value?");
     const StructType *STy = StructType::get(getGlobalContext(), Elts, false);
 
     unsigned i = 0;
@@ -1072,18 +1073,19 @@
       Elts.push_back(ATy);
     }
 
-    // Put any left over bytes into one last register.  This target-independent
-    // code does not know the size of the argument registers, so use the
-    // smallest size that will work.
-    if (Size > 4) {
-      Elts.push_back(Type::getInt64Ty(getGlobalContext()));
-    } else if (Size > 2) {
+    if (Size >= 4) {
       Elts.push_back(Type::getInt32Ty(getGlobalContext()));
-    } else if (Size > 1) {
+      Size -= 4;
+    }
+    if (Size >= 2) {
       Elts.push_back(Type::getInt16Ty(getGlobalContext()));
-    } else {
+      Size -= 2;
+    }
+    if (Size >= 1) {
       Elts.push_back(Type::getInt8Ty(getGlobalContext()));
+      Size -= 1;
     }
+    assert(Size == 0 && "Didn't cover value?");
     const StructType *STy = StructType::get(getGlobalContext(), Elts, false);
 
     unsigned i = 0;