Changeset 5c69a1e

Timestamp:

May 26, 2017, 5:48:07 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:

38bfe05b

Parents:

736fe25 (diff), 65f9dec (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

Files:

• Jenkinsfile (modified) (3 diffs)
• src/SymTab/Indexer.cc (modified) (3 diffs)

Jenkinsfile

@@ -28 +28 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        notify_server()
+                        notify_server(1)
 
                         prepare_build()
@@ -46 +46 @@
                         publish()
 
-                        notify_server()
+                        notify_server(45)
                 }
         }
@@ -171 +171 @@
 }
 
-def notify_server() {
-        sh 'curl --silent -X POST http://plg2:8082/jenkins/notify > /dev/null || true'
+def notify_server(int wait) {
+        sh """curl --silent --data "wait=${wait}" -X POST http://plg2:8082/jenkins/notify > /dev/null || true"""
         return
 }

src/SymTab/Indexer.cc

@@ -124 +124 @@
                         };
                         // properties for this type
-                        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
+                        bool existsUserDefinedFunc = false;    // any user-defined function found
+                        bool existsUserDefinedCtor = false;    // any user-defined constructor found
+                        bool existsUserDefinedDtor = false;    // any user-defined destructor found
+                        bool existsUserDefinedCopyFunc = false;    // user-defined copy ctor found
+                        bool existsUserDefinedDefaultCtor = false; // user-defined default ctor found
                         std::list< DeclBall > decls;
 
@@ -138 +139 @@
                                 bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
                                 decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
-                                userDefinedFunc = userDefinedFunc || isUserDefinedFunc;
-                                userDefinedCtor = userDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
-                                userDefinedDtor = userDefinedDtor || (isUserDefinedFunc && isDtor);
-                                userDefinedCopyFunc = userDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
+                                existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
+                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
+                                existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
+                                existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
+                                existsUserDefinedDefaultCtor = existsUserDefinedDefaultCtor || (isUserDefinedFunc && isDefaultCtor);
                                 return *this;
                         }
@@ -163 +165 @@
                 }
 
-                // if a type contains user defined ctor/dtors, then special rules trigger, which determine
-                // the set of ctor/dtors that are seen by the requester. In particular, if the user defines
+                // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
+                // the set of ctor/dtor/assign that are seen by the requester. In particular, if the user defines
                 // 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.
+                // If the user defines any ctor then the generated default ctor should not be seen (intrinsic default
+                // ctor must be overridden exactly).
                 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.userDefinedCtor && ball.isDefaultCtor) || (! val.userDefinedCopyFunc && ball.isCopyFunc) || (! val.userDefinedDtor && ball.isDtor) ) {
+                                bool noUserDefinedFunc = ! val.existsUserDefinedFunc;
+                                bool isUserDefinedFunc = ball.isUserDefinedFunc;
+                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl->get_linkage() == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
+                                bool isAcceptableCopyFunc = ! val.existsUserDefinedCopyFunc && ball.isCopyFunc; // handles copy ctor and assignment operator
+                                bool isAcceptableDtor = ! val.existsUserDefinedDtor && ball.isDtor;
+                                if ( noUserDefinedFunc || isUserDefinedFunc || isAcceptableDefaultCtor || isAcceptableCopyFunc || isAcceptableDtor ) {
                                         // decl conforms to the rules described above, so it should be seen by the requester
                                         out.push_back( ball.decl );