aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/CGExprAgg.cpp7
-rw-r--r--test/CodeGen/struct-comma.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index c7c250ee7b..2ac473439e 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -82,6 +82,7 @@ public:
void VisitBinaryOperator(const BinaryOperator *BO);
void VisitBinAssign(const BinaryOperator *E);
void VisitOverloadExpr(const OverloadExpr *E);
+ void VisitBinComma(const BinaryOperator *E);
void VisitConditionalOperator(const ConditionalOperator *CO);
@@ -213,6 +214,12 @@ void AggExprEmitter::VisitOverloadExpr(const OverloadExpr *E)
EmitAggregateCopy(DestPtr, RV.getAggregateAddr(), E->getType());
}
+void AggExprEmitter::VisitBinComma(const BinaryOperator *E)
+{
+ CGF.EmitAnyExpr(E->getLHS());
+ CGF.EmitAggExpr(E->getRHS(), DestPtr, false);
+}
+
void AggExprEmitter::VisitStmtExpr(const StmtExpr *E) {
CGF.EmitCompoundStmt(*E->getSubStmt(), true, DestPtr, VolatileDest);
}
diff --git a/test/CodeGen/struct-comma.c b/test/CodeGen/struct-comma.c
new file mode 100644
index 0000000000..e8070dd178
--- /dev/null
+++ b/test/CodeGen/struct-comma.c
@@ -0,0 +1,4 @@
+// RUN: clang %s -emit-llvm
+
+struct S {int a, b;} x;
+void a(struct S* b) {*b = (r(), x);}