aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/TargetInfo.cpp4
-rw-r--r--test/CodeGenCXX/regparm.cpp13
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index a9e11cb954..6a929a17cc 100644
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -810,6 +810,10 @@ bool X86_32ABIInfo::shouldUseInReg(QualType Ty, unsigned &FreeRegs) const {
return false;
unsigned SizeInRegs = (getContext().getTypeSize(Ty) + 31) / 32;
+
+ if (SizeInRegs == 0)
+ return false;
+
if (SizeInRegs > FreeRegs) {
FreeRegs = 0;
return false;
diff --git a/test/CodeGenCXX/regparm.cpp b/test/CodeGenCXX/regparm.cpp
index 07e9aa046e..2196c798bf 100644
--- a/test/CodeGenCXX/regparm.cpp
+++ b/test/CodeGenCXX/regparm.cpp
@@ -21,7 +21,18 @@ struct S2 {
};
void __attribute__((regparm(3))) foo3(struct S2 a, int b);
-// declare void @_Z4foo12S1i(i32 inreg, i32 inreg) optsize
+// CHECK: declare void @_Z4foo32S2i(i32 inreg, i32 inreg)
void bar3(struct S2 a, int b) {
foo3(a, b);
}
+
+struct S3 {
+ struct {
+ struct {} b[0];
+ } a;
+};
+__attribute((regparm(2))) void foo4(S3 a, int b);
+// CHECK: declare void @_Z4foo42S3i(%struct.S3* byval align 4, i32 inreg)
+void bar3(S3 a, int b) {
+ foo4(a, b);
+}