Changeset 9b086ca

Timestamp:

Sep 7, 2018, 6:20:22 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

cde3891

Parents:

2f86ddf

Message:

Elide generated dtor handler for intrinsic arguments and returns

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -558 +558 @@
                         Expression * dtor = makeCtorDtor( "^?{}", ret );
 
-                        // // xxx - check if intrinsic and elide if so
-                        // if ( arg && isIntrinsicCallExpr( dtor ) ) {
-                        //      arg = new CommaExpr( arg, new VariableExpr( ret ) );
-                        //      return;
-                        // }
+                        // if the chosen destructor is intrinsic, elide the generated dtor handler
+                        if ( arg && isIntrinsicCallExpr( dtor ) ) {
+                                arg = new CommaExpr( arg, new VariableExpr( ret ) );
+                                return;
+                        }
 
                         if ( ! dtor->env ) dtor->env = maybeClone( env );