Use a single integer type for a sub-doubleword part of a byval structure.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143666 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index 2c93249..c3d5ee1 100644
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -3082,18 +3082,11 @@
for (unsigned N = (StructSize - LastOffset) / 64; N; --N)
ArgList.push_back(I64);
- // Whatever is left over goes into a structure consisting of sub-doubleword
- // types. For example, if the size of the remainder is 40-bytes,
- // struct {i32, i8} is added to ArgList.
+ // If the size of the remainder is not zero, add one more integer type to
+ // ArgList.
unsigned R = (StructSize - LastOffset) % 64;
- SmallVector<llvm::Type*, 3> ArgList2;
-
- for (; R; R &= (R - 1))
- ArgList2.insert(ArgList2.begin(),
- llvm::IntegerType::get(getVMContext(), (R & (R - 1)) ^ R));
-
- if (!ArgList2.empty())
- ArgList.push_back(llvm::StructType::get(getVMContext(), ArgList2));
+ if (R)
+ ArgList.push_back(llvm::IntegerType::get(getVMContext(), R));
return llvm::StructType::get(getVMContext(), ArgList);
}