Changeset 395fc37 for src/ResolvExpr/Resolver.cc

Timestamp:

Mar 16, 2017, 6:14:32 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

615a096

Parents:

6f95000 (diff), 1fbab5a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -240 +240 @@
                 functionReturn = ResolvExpr::extractResultType( functionDecl->get_functionType() );
                 Parent::visit( functionDecl );
+
+                // default value expressions have an environment which shouldn't be there and trips up later passes.
+                // xxx - it might be necessary to somehow keep the information from this environment, but I can't currently
+                // see how it's useful.
+                for ( Declaration * d : functionDecl->get_functionType()->get_parameters() ) {
+                        if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( d ) ) {
+                                if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->get_init() ) ) {
+                                        delete init->get_value()->get_env();
+                                        init->get_value()->set_env( nullptr );
+                                }
+                        }
+                }
         }