Ignore:
Timestamp:
May 12, 2016, 1:19:59 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Autogen.cc

    rec79847 rfb24492  
    1010// Created On       : Thu Mar 03 15:45:56 2016
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Tue May 03 16:56:21 2016
     12// Last Modified On : Wed May 11 13:22:03 2016
    1313// Update Count     : 1
    1414//
     
    217217                                if ( type->get_qualifiers().isConst ) {
    218218                                        // don't assign const members
     219                                        continue;
     220                                }
     221
     222                                if ( field->get_name() == "" ) {
     223                                        // don't assign to anonymous members
     224                                        // xxx - this is a temporary fix. Anonymous members tie into
     225                                        // our inheritance model. I think the correct way to handle this is to
     226                                        // cast the structure to the type of the member and let the resolver
     227                                        // figure out whether it's valid and have a pass afterwards that fixes
     228                                        // the assignment to use pointer arithmetic with the offset of the
     229                                        // member, much like how generic type members are handled.
    219230                                        continue;
    220231                                }
     
    317328                        if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( member ) ) ) {
    318329                                // don't make a function whose parameter is an unnamed bitfield
     330                                continue;
     331                        } else if ( member->get_name() == "" ) {
     332                                // don't assign to anonymous members
     333                                // xxx - this is a temporary fix. Anonymous members tie into
     334                                // our inheritance model. I think the correct way to handle this is to
     335                                // cast the structure to the type of the member and let the resolver
     336                                // figure out whether it's valid and have a pass afterwards that fixes
     337                                // the assignment to use pointer arithmetic with the offset of the
     338                                // member, much like how generic type members are handled.
    319339                                continue;
    320340                        }
Note: See TracChangeset for help on using the changeset viewer.