[llvm-branch-commits] [llvm-gcc-branch] r92942 - /llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp

[Dale Johannesen]

Author: johannes
Date: Thu Jan  7 14:56:07 2010
New Revision: 92942

URL: http://llvm.org/viewvc/llvm-project?rev=92942&view=rev
Log:
--- Merging r92940 into '.':
U    gcc/llvm-convert.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp?rev=92942&r1=92941&r2=92942&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp Thu Jan  7 14:56:07 2010
@@ -2776,7 +2776,9 @@
     return 0;
 
   if (Client.isAggrReturn()) {
-    if (TD.getTypeAllocSize(Call->getType()) <= TD.getTypeAllocSize(DestLoc->Ptr->getType())) {
+    if (TD.getTypeAllocSize(Call->getType()) <= 
+        TD.getTypeAllocSize(cast<PointerType>(DestLoc->Ptr->getType())
+                                             ->getElementType())) {
       Value *Dest = BitCastToType(DestLoc->Ptr, Call->getType()->getPointerTo());
       LLVM_EXTRACT_MULTIPLE_RETURN_VALUE(Call,Dest,DestLoc->Volatile,Builder);
     } else {