Changeset dd05e12

Timestamp:

Mar 2, 2018, 5:34:51 PM (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:

09c72d5

Parents:

986dd36

git-author:

Rob Schluntz <rschlunt@…> (03/02/18 17:08:09)

git-committer:

Rob Schluntz <rschlunt@…> (03/02/18 17:34:51)

Message:

Minor code cleanup

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -448 +448 @@
                         ResolvExpr::findVoidExpression( resolved, indexer );
                         assert( resolved );
-                        if ( resolved->get_env() ) {
+                        if ( resolved->env ) {
                                 // Extract useful information and discard new environments. Keeping them causes problems in PolyMutator passes.
-                                env->add( *resolved->get_env() );
-                                delete resolved->get_env();
-                                resolved->set_env( nullptr );
+                                env->add( *resolved->env );
+                                delete resolved->env;
+                                resolved->env = nullptr;
                         } // if
                         delete stmt;

src/ResolvExpr/Resolver.cc

@@ -788 +788 @@
                 stmtExpr->accept( resolver );
                 stmtExpr->computeResult();
+                // xxx - aggregate the environments from all statements? Possibly in AlternativeFinder instead?
         }
 
@@ -793 +794 @@
                 visit_children = false;
                 // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit
-                maybeAccept( ctorInit->get_ctor(), *visitor );
-                maybeAccept( ctorInit->get_dtor(), *visitor );
+                maybeAccept( ctorInit->ctor, *visitor );
+                maybeAccept( ctorInit->dtor, *visitor );
 
                 // found a constructor - can get rid of C-style initializer
-                delete ctorInit->get_init();
-                ctorInit->set_init( NULL );
+                delete ctorInit->init;
+                ctorInit->init = nullptr;
 
                 // intrinsic single parameter constructors and destructors do nothing. Since this was
                 // implicitly generated, there's no way for it to have side effects, so get rid of it
                 // to clean up generated code.
-                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->get_ctor() ) ) {
-                        delete ctorInit->get_ctor();
-                        ctorInit->set_ctor( NULL );
-                }
-
-                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->get_dtor() ) ) {
-                        delete ctorInit->get_dtor();
-                        ctorInit->set_dtor( NULL );
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) {
+                        delete ctorInit->ctor;
+                        ctorInit->ctor = nullptr;
+                }
+
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) {
+                        delete ctorInit->dtor;
+                        ctorInit->dtor = nullptr;
                 }