Changes in src/InitTweak/InitTweak.cc [aedfd91:cad355a]

File:

• src/InitTweak/InitTweak.cc (modified) (3 diffs)

src/InitTweak/InitTweak.cc

@@ -57 +57 @@
                         (objDecl->get_init() == NULL ||
                                 ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() )) &&
-                        ! isDesignated( objDecl->get_init() )
-                        && objDecl->get_storageClass() != DeclarationNode::Extern;
+                        ! isDesignated( objDecl->get_init() );
         }
 
@@ -85 +84 @@
                 }
         }
-        namespace {
-                VariableExpr * getCalledFunction( ApplicationExpr * appExpr ) {
-                        assert( appExpr );
-                        return dynamic_cast< VariableExpr * >( appExpr->get_function() );
-                }
-        }
-
-        ApplicationExpr * isIntrinsicCallExpr( Expression * expr ) {
-                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr );
-                if ( ! appExpr ) return NULL;
-                VariableExpr * function = getCalledFunction( appExpr );
-                assert( function );
-                // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
-                // will call all member dtors, and some members may have a user defined dtor.
-                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
-        }
 
         bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
                 Expression * callExpr = getCtorDtorCall( stmt );
                 if ( ! callExpr ) return false;
-                if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                        assert( ! appExpr->get_function()->get_results().empty() );
-                        FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_results().front() );
-                        assert( funcType );
-                        return funcType->get_parameters().size() == 1;
-                }
-                return false;
+                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( callExpr );
+                assert( appExpr );
+                VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() );
+                assert( function );
+                // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
+                // will call all member dtors, and some members may have a user defined dtor.
+                FunctionType * funcType = GenPoly::getFunctionType( function->get_var()->get_type() );
+                assert( funcType );
+                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic && funcType->get_parameters().size() == 1;
         }
 
@@ -175 +160 @@
                 else return NULL;
         }
-
-        class ConstExprChecker : public Visitor {
-        public:
-                ConstExprChecker() : isConstExpr( true ) {}
-
-                virtual void visit( ApplicationExpr *applicationExpr ) { isConstExpr = false; }
-                virtual void visit( UntypedExpr *untypedExpr ) { isConstExpr = false; }
-                virtual void visit( NameExpr *nameExpr ) { isConstExpr = false; }
-                virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
-                virtual void visit( LabelAddressExpr *labAddressExpr ) { isConstExpr = false; }
-                virtual void visit( UntypedMemberExpr *memberExpr ) { isConstExpr = false; }
-                virtual void visit( MemberExpr *memberExpr ) { isConstExpr = false; }
-                virtual void visit( VariableExpr *variableExpr ) { isConstExpr = false; }
-                virtual void visit( ConstantExpr *constantExpr ) { /* bottom out */ }
-                // these might be okay?
-                // virtual void visit( SizeofExpr *sizeofExpr );
-                // virtual void visit( AlignofExpr *alignofExpr );
-                // virtual void visit( UntypedOffsetofExpr *offsetofExpr );
-                // virtual void visit( OffsetofExpr *offsetofExpr );
-                // virtual void visit( OffsetPackExpr *offsetPackExpr );
-                // virtual void visit( AttrExpr *attrExpr );
-                // virtual void visit( CommaExpr *commaExpr );
-                // virtual void visit( LogicalExpr *logicalExpr );
-                // virtual void visit( ConditionalExpr *conditionalExpr );
-                virtual void visit( TupleExpr *tupleExpr ) { isConstExpr = false; }
-                virtual void visit( SolvedTupleExpr *tupleExpr ) { isConstExpr = false; }
-                virtual void visit( TypeExpr *typeExpr ) { isConstExpr = false; }
-                virtual void visit( AsmExpr *asmExpr ) { isConstExpr = false; }
-                virtual void visit( UntypedValofExpr *valofExpr ) { isConstExpr = false; }
-                virtual void visit( CompoundLiteralExpr *compLitExpr ) { isConstExpr = false; }
-
-                bool isConstExpr;
-        };
-
-        bool isConstExpr( Expression * expr ) {
-                if ( expr ) {
-                        ConstExprChecker checker;
-                        expr->accept( checker );
-                        return checker.isConstExpr;
-                }
-                return true;
-        }
-
-        bool isConstExpr( Initializer * init ) {
-                if ( init ) {
-                        ConstExprChecker checker;
-                        init->accept( checker );
-                        return checker.isConstExpr;
-                } // if
-                // for all intents and purposes, no initializer means const expr
-                return true;
-        }
-
 }