[PATCH] D10907: [CodeGen] Correctly handle base classes which are passed in memory
David Majnemer
david.majnemer at gmail.com
Thu Jul 2 13:52:59 PDT 2015
majnemer created this revision.
majnemer added reviewers: asl, ddunbar, rnk, rjmccall.
majnemer added a subscriber: cfe-commits-list.
We didn't correctly process the case where a base class is classified as
MEMORY. This would cause us to trip over an assertion.
This fixes PR24020.
http://reviews.llvm.org/D10907
Files:
lib/CodeGen/TargetInfo.cpp
test/CodeGenCXX/x86_64-arguments.cpp
Index: test/CodeGenCXX/x86_64-arguments.cpp
===================================================================
--- test/CodeGenCXX/x86_64-arguments.cpp
+++ test/CodeGenCXX/x86_64-arguments.cpp
@@ -196,3 +196,19 @@
return sret;
}
}
+
+namespace test10 {
+#pragma pack(1)
+struct BasePacked {
+ char one;
+ short two;
+};
+#pragma pack()
+struct DerivedPacked : public BasePacked {
+ int three;
+};
+// CHECK-LABEL: define i32 @_ZN6test1020FuncForDerivedPackedENS_13DerivedPackedE({{.*}}* byval align 8
+int FuncForDerivedPacked(DerivedPacked d) {
+ return d.three;
+}
+}
Index: lib/CodeGen/TargetInfo.cpp
===================================================================
--- lib/CodeGen/TargetInfo.cpp
+++ lib/CodeGen/TargetInfo.cpp
@@ -2073,8 +2073,10 @@
classify(I.getType(), Offset, FieldLo, FieldHi, isNamedArg);
Lo = merge(Lo, FieldLo);
Hi = merge(Hi, FieldHi);
- if (Lo == Memory || Hi == Memory)
- break;
+ if (Lo == Memory || Hi == Memory) {
+ postMerge(Size, Lo, Hi);
+ return;
+ }
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D10907.28974.patch
Type: text/x-patch
Size: 1099 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150702/866d570e/attachment.bin>
More information about the cfe-commits
mailing list