Try to fix error in VariableReflectionTest.cpp (possibly need to revert)

Author: mcbarton

unittests/CppInterOp/VariableReflectionTest.cpp

@@ -57,15 +57,15 @@ TEST(VariableReflectionTest, GetDatamembers) {
 
 #define CODE                                                                   \
   struct Klass1 {                                                              \
-    Klass1(int i) : num(1), b(i) {}                                            \
+    Klass1(int i) : num(1), foo(i) {}                                          \
     int num;                                                                   \
     union foo {                                                                \
       double a;                                                                \
       int b;                                                                   \
     };                                                                         \
   } const k1(5);                                                               \
   struct Klass2 {                                                              \
-    Klass2(double d) : num(2), a(d) {}                                         \
+    Klass2(double d) : num(2), foo.a(d) {}                                     \
     int num;                                                                   \
     struct foo {                                                               \
       double a;                                                                \
@@ -112,23 +112,23 @@ TEST(VariableReflectionTest, DatamembersWithAnonymousStructOrUnion) {
 
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass1[0]), 0);
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass1[1]),
-            ((intptr_t) & (k1.a)) - ((intptr_t) & (k1.num)));
+            ((intptr_t) & (k1.foo.a)) - ((intptr_t) & (k1.num)));
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass1[2]),
-            ((intptr_t) & (k1.b)) - ((intptr_t) & (k1.num)));
+            ((intptr_t) & (k1.foo.b)) - ((intptr_t) & (k1.num)));
 
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass2[0]), 0);
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass2[1]),
-            ((intptr_t) & (k2.a)) - ((intptr_t) & (k2.num)));
+            ((intptr_t) & (k2.foo.a)) - ((intptr_t) & (k2.num)));
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass2[2]),
-            ((intptr_t) & (k2.b)) - ((intptr_t) & (k2.num)));
+            ((intptr_t) & (k2.foo.b)) - ((intptr_t) & (k2.num)));
 
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass3[0]), 0);
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass3[1]),
-            ((intptr_t) & (k3.a)) - ((intptr_t) & (k3.num)));
+            ((intptr_t) & (k3.foo.a)) - ((intptr_t) & (k3.num)));
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass3[2]),
-            ((intptr_t) & (k3.b)) - ((intptr_t) & (k3.num)));
+            ((intptr_t) & (k3.foo.bar.b)) - ((intptr_t) & (k3.num)));
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass3[3]),
-            ((intptr_t) & (k3.c)) - ((intptr_t) & (k3.num)));
+            ((intptr_t) & (k3.foo.bar.b)) - ((intptr_t) & (k3.num)));
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass3[4]),
             ((intptr_t) & (k3.num2)) - ((intptr_t) & (k3.num)));
 }