Changeset 4e2b9710 for src/SymTab/Autogen.cc

Timestamp:

Aug 25, 2016, 9:14:18 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

a839867

Parents:

c1c1112 (diff), 486341f (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' of plg2:software/cfa/cfa-cc

File:

• src/SymTab/Autogen.cc (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -68 +68 @@
                 copy->get_args().push_back( new VariableExpr( dstParam ) );
                 copy->get_args().push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
-                copy->get_args().push_back( new SizeofExpr( unionType ) );
+                copy->get_args().push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
 
                 *out++ = new ExprStmt( noLabels, copy );
@@ -420 +420 @@
                 copyCtorDecl->set_statements( assignDecl->get_statements()->clone() );
 
+                // create a constructor which takes the first member type as a parameter.
+                // for example, for Union A { int x; double y; }; generate
+                // void ?{}(A *, int)
+                // This is to mimic C's behaviour which initializes the first member of the union.
+                std::list<Declaration *> memCtors;
+                for ( Declaration * member : aggregateDecl->get_members() ) {
+                        if ( DeclarationWithType * field = dynamic_cast< DeclarationWithType * >( member ) ) {
+                                ObjectDecl * srcParam = new ObjectDecl( "src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 );
+
+                                FunctionType * memCtorType = ctorType->clone();
+                                memCtorType->get_parameters().push_back( srcParam );
+                                FunctionDecl * ctor = new FunctionDecl( "?{}", functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::AutoGen, memCtorType, new CompoundStmt( noLabels ), true, false );
+                                ctor->fixUniqueId();
+
+                                makeUnionFieldsAssignment( srcParam, dstParam, cloneWithParams( refType, unionParams ), back_inserter( ctor->get_statements()->get_kids() ) );
+                                memCtors.push_back( ctor );
+                                // only generate a ctor for the first field
+                                break;
+                        }
+                }
+
                 declsToAdd.push_back( assignDecl );
                 declsToAdd.push_back( ctorDecl );
                 declsToAdd.push_back( copyCtorDecl );
                 declsToAdd.push_back( dtorDecl );
+                declsToAdd.splice( declsToAdd.end(), memCtors );
         }