Changeset 356189a for src/SymTab

Timestamp:

Apr 14, 2016, 5:11:26 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:

b617e4b

Parents:

70a06f6

git-author:

Rob Schluntz <rschlunt@…> (04/14/16 17:10:08)

git-committer:

Rob Schluntz <rschlunt@…> (04/14/16 17:11:26)

Message:

output intrinsic constructor expressions as void expression or C assignment, don't generate field constructor which takes unnamed bitfield as a parameter

File:

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

src/SymTab/Autogen.cc ¶

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 16:00:16 2016
+// Last Modified On : Thu Apr 14 16:58:35 2016
 // Update Count     : 1
 //
@@ -59 +59 @@
         }
 
+        bool isUnnamedBitfield( ObjectDecl * obj ) {
+                return obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL;
+        }
+
         template< typename OutputIterator >
         void makeScalarFunction( Expression *src, ObjectDecl *dstParam, DeclarationWithType *member, std::string fname, OutputIterator out ) {
                 ObjectDecl *obj = dynamic_cast<ObjectDecl *>( member );
                 // unnamed bit fields are not copied as they cannot be accessed
-                if ( obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL ) return;
+                if ( isUnnamedBitfield( obj ) ) return;
 
                 // want to be able to generate assignment, ctor, and dtor generically,
@@ -321 +325 @@
                         DeclarationWithType * member = dynamic_cast<DeclarationWithType *>( *i );
                         assert( member );
+                        if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( member ) ) ) {
+                                // don't make a function whose parameter is an unnamed bitfield
+                                continue;
+                        }
                         memCtorType->get_parameters().push_back( new ObjectDecl( member->get_name(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, member->get_type()->clone(), 0 ) );
                         FunctionDecl * ctor = new FunctionDecl( "?{}", functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::AutoGen, memCtorType->clone(), new CompoundStmt( noLabels ), true, false );