Changeset 0a22cda for src

Timestamp:

Oct 19, 2017, 11:13:11 AM (7 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:

6137fbb

Parents:

eaa2edaa

git-author:

Rob Schluntz <rschlunt@…> (10/11/17 15:57:07)

git-committer:

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

Message:

Remove unnecessary resolver-generated initialization casts

File:

• src/ResolvExpr/Resolver.cc (modified) (6 diffs)

src/ResolvExpr/Resolver.cc

@@ -113 +113 @@
                         env.makeSubstitution( *expr->get_env() );
                 }
+
+                void removeExtraneousCast( Expression *& expr, const SymTab::Indexer & indexer ) {
+                        if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
+                                if ( ResolvExpr::typesCompatible( castExpr->arg->result, castExpr->result, indexer ) ) {
+                                        // cast is to the same type as its argument, so it's unnecessary -- remove it
+                                        expr = castExpr->arg;
+                                        castExpr->arg = nullptr;
+                                        std::swap( expr->env, castExpr->env );
+                                        delete castExpr;
+                                }
+                        }
+                }
         } // namespace
 
@@ -151 +163 @@
                 untyped = new CastExpr( untyped, type );
                 findSingleExpression( untyped, indexer );
-                if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( untyped ) ) {
-                        if ( ResolvExpr::typesCompatible( castExpr->arg->result, castExpr->result, indexer ) ) {
-                                // cast is to the same type as its argument, so it's unnecessary -- remove it
-                                untyped = castExpr->arg;
-                                castExpr->arg = nullptr;
-                                delete castExpr;
-                        }
-                }
+                removeExtraneousCast( untyped, indexer );
         }
 
@@ -577 +582 @@
                 visit_children = false;
                 // resolve initialization using the possibilities as determined by the currentObject cursor
-                Expression * newExpr = new UntypedInitExpr( singleInit->get_value(), currentObject.getOptions() );
+                Expression * newExpr = new UntypedInitExpr( singleInit->value, currentObject.getOptions() );
                 findSingleExpression( newExpr, indexer );
                 InitExpr * initExpr = strict_dynamic_cast< InitExpr * >( newExpr );
@@ -592 +597 @@
                 // get the actual object's type (may not exactly match what comes back from the resolver due to conversions)
                 Type * initContext = currentObject.getCurrentType();
+
+                removeExtraneousCast( newExpr, indexer );
 
                 // check if actual object's type is char[]
@@ -599 +606 @@
                                 if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
                                         if ( isCharType( pt->get_base() ) ) {
-                                                // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
-                                                CastExpr *ce = strict_dynamic_cast< CastExpr * >( newExpr );
-                                                newExpr = ce->get_arg();
-                                                ce->set_arg( nullptr );
-                                                delete ce;
+                                                if ( CastExpr *ce = dynamic_cast< CastExpr * >( newExpr ) ) {
+                                                        // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
+                                                        newExpr = ce->get_arg();
+                                                        ce->set_arg( nullptr );
+                                                        std::swap( ce->env, newExpr->env );
+                                                        delete ce;
+                                                }
                                         }
                                 }
@@ -610 +619 @@
 
                 // set initializer expr to resolved express
-                singleInit->set_value( newExpr );
+                singleInit->value = newExpr;
 
                 // move cursor to next object in preparation for next initializer