Changeset fb24492 for src/SymTab

Timestamp:

May 12, 2016, 1:19:59 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

03286aa, 7b3f66b

Parents:

ec79847 (diff), 228851d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

Conflicts:

src/SymTab/Validate.cc

Location:

src/SymTab

Files:

• Autogen.cc (modified) (3 diffs)
• Validate.cc (modified) (1 diff)

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue May 03 16:56:21 2016
+// Last Modified On : Wed May 11 13:22:03 2016
 // Update Count     : 1
 //
@@ -217 +217 @@
                                 if ( type->get_qualifiers().isConst ) {
                                         // don't assign const members
+                                        continue;
+                                }
+
+                                if ( field->get_name() == "" ) {
+                                        // don't assign to anonymous members
+                                        // xxx - this is a temporary fix. Anonymous members tie into
+                                        // our inheritance model. I think the correct way to handle this is to
+                                        // cast the structure to the type of the member and let the resolver
+                                        // figure out whether it's valid and have a pass afterwards that fixes
+                                        // the assignment to use pointer arithmetic with the offset of the
+                                        // member, much like how generic type members are handled.
                                         continue;
                                 }
@@ -317 +328 @@
                         if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( member ) ) ) {
                                 // don't make a function whose parameter is an unnamed bitfield
+                                continue;
+                        } else if ( member->get_name() == "" ) {
+                                // don't assign to anonymous members
+                                // xxx - this is a temporary fix. Anonymous members tie into
+                                // our inheritance model. I think the correct way to handle this is to
+                                // cast the structure to the type of the member and let the resolver
+                                // figure out whether it's valid and have a pass afterwards that fixes
+                                // the assignment to use pointer arithmetic with the offset of the
+                                // member, much like how generic type members are handled.
                                 continue;
                         }

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:37:23 2016
+// Last Modified On : Wed May 11 13:17:52 2016
 // Update Count     : 297
 //