[cfe-commits] r130417 - /cfe/trunk/lib/CodeGen/TargetInfo.cpp

[Stuart Hastings]

Author: stuart
Date: Thu Apr 28 13:16:06 2011
New Revision: 130417

URL: http://llvm.org/viewvc/llvm-project?rev=130417&view=rev
Log:
Replace SmallVector with an array, as suggested by Frits van Bommel.  rdar://problem/7662569

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

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=130417&r1=130416&r2=130417&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Thu Apr 28 13:16:06 2011
@@ -2347,14 +2347,7 @@
   if (getContext().getTypeSizeInChars(Ty) <= CharUnits::fromQuantity(32)) {
     ElemTy = llvm::Type::getInt32Ty(getVMContext());
     SizeRegs = (getContext().getTypeSize(Ty) + 31) / 32;
-    llvm::SmallVector<const llvm::Type*, 8> LLVMFields;
-    LLVMFields.push_back(llvm::ArrayType::get(ElemTy, SizeRegs));
-    const llvm::Type* STy = llvm::StructType::get(getVMContext(), LLVMFields,
-                                                  true);
-    return ABIArgInfo::getDirect(STy);
-  }
-
-  if (getABIKind() == ARMABIInfo::APCS) {
+  } else if (getABIKind() == ARMABIInfo::APCS) {
     // Initial ARM ByVal support is APCS-only.
     return ABIArgInfo::getIndirect(0, /*ByVal=*/true);
   } else {
@@ -2363,12 +2356,12 @@
     // byval.
     ElemTy = llvm::Type::getInt64Ty(getVMContext());
     SizeRegs = (getContext().getTypeSize(Ty) + 63) / 64;
-    llvm::SmallVector<const llvm::Type*, 8> LLVMFields;
-    LLVMFields.push_back(llvm::ArrayType::get(ElemTy, SizeRegs));
-    const llvm::Type* STy = llvm::StructType::get(getVMContext(), LLVMFields,
-                                                  true);
-    return ABIArgInfo::getDirect(STy);
   }
+
+  const llvm::Type* LLVMField[1] = { llvm::ArrayType::get(ElemTy, SizeRegs) };
+  const llvm::Type* STy = llvm::StructType::get(getVMContext(), LLVMField,
+                                                true);
+  return ABIArgInfo::getDirect(STy);
 }
 
 static bool isIntegerLikeType(QualType Ty, ASTContext &Context,