Changeset 395fc37 for src/SymTab/Indexer.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/SymTab/Indexer.cc (modified) (3 diffs)

src/SymTab/Indexer.cc

@@ -119 +119 @@
                                 FunctionDecl * decl;
                                 bool isUserDefinedFunc; // properties for this particular decl
-                                bool isDefaultFunc;
+                                bool isDefaultCtor;
+                                bool isDtor;
                                 bool isCopyFunc;
                         };
                         // properties for this type
-                        bool userDefinedFunc = false; // any user defined function found
-                        bool userDefinedDefaultFunc = false; // user defined default ctor found
-                        bool userDefinedCopyFunc = false; // user defined copy ctor found
+                        bool userDefinedFunc = false; // any user-defined function found
+                        bool userDefinedCtor = false; // any user-defined constructor found
+                        bool userDefinedDtor = false; // any user-defined destructor found
+                        bool userDefinedCopyFunc = false; // user-defined copy ctor found
                         std::list< DeclBall > decls;
 
@@ -132 +134 @@
                         ValueType & operator+=( FunctionDecl * function ) {
                                 bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
-                                bool isDefaultFunc = function->get_functionType()->get_parameters().size() == 1;
+                                bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
+                                bool isDtor = InitTweak::isDestructor( function );
                                 bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
-                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultFunc, isCopyFunc } );
+                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
                                 userDefinedFunc = userDefinedFunc || isUserDefinedFunc;
-                                userDefinedDefaultFunc = userDefinedDefaultFunc || (isUserDefinedFunc && isDefaultFunc);
+                                userDefinedCtor = userDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
+                                userDefinedDtor = userDefinedDtor || (isUserDefinedFunc && isDtor);
                                 userDefinedCopyFunc = userDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
                                 return *this;
@@ -163 +167 @@
                 // a default ctor, then the generated default ctor should never be seen, likewise for copy ctor
                 // and dtor. If the user defines any ctor/dtor, then no generated field ctors should be seen.
+                // If the user defines any ctor then the generated default ctor should not be seen.
                 for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
                         ValueType & val = pair.second;
                         for ( ValueType::DeclBall ball : val.decls ) {
-                                if ( ! val.userDefinedFunc || ball.isUserDefinedFunc || (! val.userDefinedDefaultFunc && ball.isDefaultFunc) || (! val.userDefinedCopyFunc && ball.isCopyFunc) ) {
+                                if ( ! val.userDefinedFunc || ball.isUserDefinedFunc || (! val.userDefinedCtor && ball.isDefaultCtor) || (! val.userDefinedCopyFunc && ball.isCopyFunc) || (! val.userDefinedDtor && ball.isDtor) ) {
                                         // decl conforms to the rules described above, so it should be seen by the requester
                                         out.push_back( ball.decl );