maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Re-enable byval for ARM in clang. rdar://problem/7662569" 

This reverts commit 67d097e1232b7d66f58989c16a45b8a11721f76e.
We found a miscompile with ARM byval, which is still being investigated.
In the meantime, this works around the problem by disabling ARM byval.

Conflicts:
	lib/CodeGen/TargetInfo.cpp

llvm-svn: 136662
This commit is contained in:
Bob Wilson 2011-08-01 23:39:04 +00:00
parent 3022d6711d
commit 8e2b75dbad
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/CodeGen/TargetInfo.cpp
View File

@ -2400,21 +2400,17 @@ ABIArgInfo ARMABIInfo::classifyArgumentType(QualType Ty) const {
// Otherwise, pass by coercing to a structure of the appropriate size. // Otherwise, pass by coercing to a structure of the appropriate size.
// //
// FIXME: This is kind of nasty... but there isn't much choice because the ARM
// backend doesn't support byval.
// FIXME: This doesn't handle alignment > 64 bits. // FIXME: This doesn't handle alignment > 64 bits.
llvm::Type* ElemTy; llvm::Type* ElemTy;
unsigned SizeRegs; unsigned SizeRegs;
if (getContext().getTypeSizeInChars(Ty) <= CharUnits::fromQuantity(64)) { if (getContext().getTypeAlign(Ty) > 32) {
ElemTy = llvm::Type::getInt32Ty(getVMContext());
SizeRegs = (getContext().getTypeSize(Ty) + 31) / 32;
} else if (getABIKind() == ARMABIInfo::APCS) {
// Initial ARM ByVal support is APCS-only.
return ABIArgInfo::getIndirect(0, /*ByVal=*/true);
} else {
// FIXME: This is kind of nasty... but there isn't much choice
// because most of the ARM calling conventions don't yet support
// byval.
ElemTy = llvm::Type::getInt64Ty(getVMContext()); ElemTy = llvm::Type::getInt64Ty(getVMContext());
SizeRegs = (getContext().getTypeSize(Ty) + 63) / 64; SizeRegs = (getContext().getTypeSize(Ty) + 63) / 64;
} else {
ElemTy = llvm::Type::getInt32Ty(getVMContext());
SizeRegs = (getContext().getTypeSize(Ty) + 31) / 32;
} }
llvm::Type *STy = llvm::Type *STy =