Make member initializers for union members work correctly.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@88989 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index 02d5c513af4d187c81b9afc676adf8967b39f237..9138059d6229eae44ef1c43ef4216f3f5b8085ae 100644 (file)
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -1530,7 +1530,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF,
     assert(!FieldType.getObjCGCAttr() && "fields cannot have GC attrs");
     LHS = LValue::MakeAddr(V, CGF.MakeQualifiers(FieldType));
   } else {
-    LHS = CGF.EmitLValueForField(ThisPtr, Field, false, 0);
+    LHS = CGF.EmitLValueForField(ThisPtr, Field, ClassDecl->isUnion(), 0);
   }
   if (FieldType->getAs<RecordType>()) {
     if (!Field->isAnonymousStructOrUnion()) {

diff --git a/test/CodeGenCXX/member-init-union.cpp b/test/CodeGenCXX/member-init-union.cpp
new file mode 100644 (file)
index 0000000..334d5fd
--- /dev/null
+++ b/test/CodeGenCXX/member-init-union.cpp
@@ -0,0 +1,10 @@
+// RUN: clang-cc %s -emit-llvm-only -verify
+
+union x {
+  int a;
+  float b;
+  x(float y) : b(y) {}
+  x(int y) : a(y) {}
+};
+x a(1), b(1.0f);
+