Changeset 0b4d93ab for src

Timestamp:

Jul 8, 2016, 6:10:47 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

07bc165, cad355a

Parents:

540b275

Message:

fix bug where field constructors would generate calls to constructors for anonymous members and unnamed bitfields

File:

• src/SymTab/Autogen.cc (modified) (1 diff)

src/SymTab/Autogen.cc

@@ -289 +289 @@
                 for ( ; member != end; ++member ) {
                         if ( DeclarationWithType * field = dynamic_cast<DeclarationWithType*>( *member ) ) {
-                                if ( parameter != params.end() ) {
+                                if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( field ) ) ) {
+                                        // don't make a function whose parameter is an unnamed bitfield
+                                        continue;
+                                } else 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;
+                                } else if ( parameter != params.end() ) {
                                         // matching parameter, initialize field with copy ctor
                                         Expression *srcselect = new VariableExpr(*parameter);