Changeset 6fc5c14

Timestamp:

Oct 19, 2017, 11:15:35 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

ab4bff5

Parents:

447c356

git-author:

Rob Schluntz <rschlunt@…> (10/17/17 10:26:33)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:35)

Message:

Skip non-constructable types during autogen

Location:

src

Files:

• InitTweak/InitTweak.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (3 diffs)
• SymTab/Indexer.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -353 +353 @@
                         assert( expr );
                         if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                return varExpr->get_var();
+                                return varExpr->var;
                         } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( expr ) ) {
-                                return memberExpr->get_member();
+                                return memberExpr->member;
                         } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
-                                return getCalledFunction( castExpr->get_arg() );
+                                return getCalledFunction( castExpr->arg );
                         } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( expr ) ) {
                                 return handleDerefCalledFunction( untypedExpr );
@@ -363 +363 @@
                                 return handleDerefCalledFunction( appExpr );
                         } else if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( expr ) ) {
-                                return getCalledFunction( addrExpr->get_arg() );
+                                return getCalledFunction( addrExpr->arg );
+                        } else if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( expr ) ) {
+                                return getCalledFunction( commaExpr->arg2 );
                         }
                         return nullptr;

src/SymTab/Autogen.cc

@@ -379 +379 @@
                                 // don't make a function whose parameter is an unnamed bitfield
                                 continue;
+                        } else if ( ! InitTweak::isConstructable( field->get_type() ) ) {
+                                continue;
                         }
                         memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 ) );
@@ -407 +409 @@
                                 }
 
-                                if ( type->get_const() && func->get_name() == "?=?" ) {
+                                if ( type->get_const() && CodeGen::isAssignment( func->name ) ) {
                                         // don't assign const members, but do construct/destruct
+                                        continue;
+                                } else if ( CodeGen::isCtorDtor( func->name ) && ! InitTweak::isConstructable( type ) ) {
+                                        // don't construct non-constructable types
                                         continue;
                                 }
@@ -441 +446 @@
                                 if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( field ) ) ) {
                                         // don't make a function whose parameter is an unnamed bitfield
+                                        continue;
+                                } else if ( ! InitTweak::isConstructable( field->get_type() ) ) {
+                                        // don't construct non-constructable types
                                         continue;
                                 } else if ( parameter != params.end() ) {

src/SymTab/Indexer.cc

@@ -407 +407 @@
                 makeWritable();
 
-                const std::string &name = decl->get_name();
+                const std::string &name = decl->name;
                 std::string mangleName;
-                if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
+                if ( LinkageSpec::isOverridable( decl->linkage ) ) {
                         // mangle the name without including the appropriate suffix, so overridable routines are placed into the
                         // same "bucket" as their user defined versions.
@@ -418 +418 @@
 
                 // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
-                if ( ! LinkageSpec::isMangled( decl->get_linkage() ) ) {
+                if ( ! LinkageSpec::isMangled( decl->linkage ) ) {
                         // NOTE this is broken in Richard's original code in such a way that it never triggers (it
                         // doesn't check decls that have the same manglename, and all C-linkage decls are defined to