Changeset 1057e3d

Timestamp:

Jun 11, 2018, 1:49:51 PM (6 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, with_gc

Children:

ee163895

Parents:

85b2300

Message:

Fix removeSpecialOverrides to delete default constructor and field constructors, and omit copy constructor and assignment operator as necessary

File:

• src/SymTab/Indexer.cc (modified) (2 diffs)

src/SymTab/Indexer.cc

@@ -126 +126 @@
                                 decls.push_back( DeclBall{ data, isUserDefinedFunc, isCopyFunc } );
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
-                                if ( isUserDefinedFunc && ! data.deleteStmt ) {
+                                if ( isUserDefinedFunc && ! deleteStmt ) {
                                         // any user-defined function can act as an implicit delete statement for generated constructors.
                                         // a delete stmt should not act as an implicit delete statement.
@@ -166 +166 @@
                                 bool isCopyFunc = ball.isCopyFunc;
                                 bool existsUserDefinedCopyFunc = val.existsUserDefinedCopyFunc;
-                                // only implicitly delete non-user defined functions that are  not intrinsic, and are
-                                // not copy functions (assignment or copy constructor), unless a user-defined copy function exists.
-                                // deleteStmt will be non-null only if a user-defined function is found.
-                                if (isNotUserDefinedFunc && (! isCopyFunc || existsUserDefinedCopyFunc)) {
-                                        ball.decl.deleteStmt = val.deleteStmt;
+
+                                // only implicitly delete non-user defined functions that are not intrinsic, and are
+                                // not copy functions (assignment or copy constructor). If a  user-defined copy function exists,
+                                // do not pass along the non-user-defined copy functions since signatures do not have to match,
+                                // and the generated functions will often be cheaper.
+                                if ( isNotUserDefinedFunc ) {
+                                        if ( isCopyFunc ) {
+                                                // Skip over non-user-defined copy functions when there is a user-defined copy function.
+                                                // Since their signatures do not have to be exact, deleting them is the wrong choice.
+                                                if ( existsUserDefinedCopyFunc ) continue;
+                                        } else {
+                                                // delete non-user-defined non-copy functions if applicable.
+                                                // deleteStmt will be non-null only if a user-defined function is found.
+                                                ball.decl.deleteStmt = val.deleteStmt;
+                                        }
                                 }
                                 out.push_back( ball.decl );