Changeset e4d3ceb

Timestamp:

Jul 12, 2016, 6:34:33 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5479e63

Parents:

4e06c1e (diff), e67f54c (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:

• Jenkins/FullBuild (added)
• Jenkinsfile (modified) (7 diffs)
• src/InitTweak/GenInit.cc (modified) (1 diff)
• src/InitTweak/InitTweak.cc (modified) (1 diff)
• src/ResolvExpr/Resolver.cc (modified) (2 diffs)
• src/SymTab/Autogen.cc (modified) (2 diffs)
• src/SymTab/Autogen.h (modified) (1 diff)
• src/tests/.expect/extension.txt (modified) (1 diff)

Jenkinsfile

@@ -2 +2 @@
 
 //===========================================================================================================
-// Main compilation routine
+// Main compilation routines
 //===========================================================================================================
 //Compilation script is done here but environnement set-up and error handling is done in main loop
-def cfa_build(boolean full_build) {
+def cfa_build(boolean full_build, String flags) {
         build_stage 'Checkout'
                 def install_dir = pwd tmp: true
@@ -23 +23 @@
                 //escapes the sandbox
                 //Also specify the compiler by hand
-                sh "./configure CXX=${currentCC.cpp_cc} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+                sh "./configure CXX=${currentCC.cpp_cc} CXXFLAGS=${flags} CFAFLAGS=${flags} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
 
                 //Compile the project
@@ -83 +83 @@
 }
 
-def push_build() {
-        //Don't use the build_stage function which outputs the compiler
-        stage 'Push'
-
-                status_prefix = 'Push'
-
-                def out_dir = pwd tmp: true
-                sh "mkdir -p ${out_dir}"
-
-                //parse git logs to find what changed
-                sh "git remote > ${out_dir}/GIT_REMOTE"
-                git_remote = readFile("${out_dir}/GIT_REMOTE")
-                remoteDoLangExists = git_remote.contains("DoLang")
-
-                if( !remoteDoLangExists ) {
-                        sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
-                }
-
-                sh "git push DoLang ${gitRefNewValue}:master"
-}
-
 //===========================================================================================================
 // Helper classes/variables/routines to make the status and stage name easier to use
@@ -155 +134 @@
 node ('master'){
 
-        boolean doPromoteBuild2DoLang
+        boolean bIsFullBuild
         def err = null
         def log_needed = false
@@ -176 +155 @@
                                                   defaultValue: false,                                          \
                                                   description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
-                                                  name: 'promoteBuild2DoLang'                           \
-                                                ]]                                                                      \
+                                                  name: 'isFullBuild'                                   \
+                                                ],                                                              \
+                                                [$class: 'ChoiceParameterDefinition',                           \
+                                                  choices: '64-bit\n32-bit',                                    \
+                                                  defaultValue: '64-bit',                                       \
+                                                  description: 'The architecture to use for compilation',       \
+                                                  name: 'buildArchitecture'                                     \
+                                                ]]                                                              \
                                         ]])
 
-                                doPromoteBuild2DoLang = promoteBuild2DoLang == 'true'
-
-                                echo "FULL BUILD = ${doPromoteBuild2DoLang}"
+                                bIsFullBuild = isFullBuild == 'true'
+                                architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
+
+                                echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
 
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                                cfa_build(doPromoteBuild2DoLang)
+                                cfa_build(bIsFullBuild, architectureFlag)
 
                                 //Compile latex documentation
                                 doc_build()
 
-                                if( doPromoteBuild2DoLang ) {
+                                if( bIsFullBuild ) {
                                         //Compile using gcc-5
                                         currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                                        cfa_build(true)
+                                        cfa_build(true, architectureFlag)
 
                                         //Compile using gcc-4.9
                                         currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                                        cfa_build(true)
-
-                                        //Push latest changes to do-lang repo
-                                        push_build()
+                                        cfa_build(true, architectureFlag)
                                 }
                         }
@@ -221 +204 @@
 
         finally {
-                //Send email with final results
-                notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
+                echo 'Build Completed'
+
+                //Send email with final results if this is not a full build
+                if( !bIsFullBuild ) {
+                        echo 'Notifying users of result'
+                        email(currentBuild.result, log_needed)
+                }
 
                 /* Must re-throw exception to propagate error */
@@ -234 +222 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-def notify_result(boolean promote, Exception err, String status, boolean log) {
-        echo 'Build completed, sending result notification'
-        if(promote)     {
-                if( err ) {
-                        promote_email(status)
-                }
-        }
-        else {
-                email(status, log)
-        }
-}
-
-//Email notification on a full build failure
-def promote_email(String status) {
-        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
-        //Configurations for email format
-        def email_subject = "[cforall git][PROMOTE - FAILURE]"
-        def email_body = """This is an automated email from the Jenkins build machine. It was
-generated because of a git hooks/post-receive script following
-a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
-Check console output at ${env.BUILD_URL} to view the results.
-
-- Status --------------------------------------------------------------
-
-PROMOTE FAILURE - ${status}
-"""
-
-        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"
-
-        //send email notification
-        emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
-}
-
 //Standard build email notification
 def email(String status, boolean log) {

src/InitTweak/GenInit.cc

@@ -162 +162 @@
                                                 // but it seems reasonable at the moment for this to be done by makeArrayFunction
                                                 // itself
-                                                assert( ctor.size() == 1 );
-                                                assert( dtor.size() == 1 );
-                                                objDecl->set_init( new ConstructorInit( new ImplicitCtorDtorStmt( ctor.front() ), new ImplicitCtorDtorStmt( dtor.front() ), objDecl->get_init() ) );
+                                                assert( ctor.size() == 1 && dynamic_cast< ImplicitCtorDtorStmt * >( ctor.front() ) );
+                                                assert( dtor.size() == 1 && dynamic_cast< ImplicitCtorDtorStmt * >( dtor.front() ) );
+                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
                                         } else {
                                                 // array came with an initializer list: initialize each element

src/InitTweak/InitTweak.cc

@@ -66 +66 @@
                 } else if ( CompoundStmt * compoundStmt = dynamic_cast< CompoundStmt * >( stmt ) ) {
                         // could also be a compound statement with a loop, in the case of an array
-                        assert( compoundStmt->get_kids().size() == 2 ); // loop variable and loop
-                        ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
-                        assert( forStmt && forStmt->get_body() );
-                        return getCtorDtorCall( forStmt->get_body() );
+                        if( compoundStmt->get_kids().size() == 2 ) {
+                                // loop variable and loop
+                                ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
+                                assert( forStmt && forStmt->get_body() );
+                                return getCtorDtorCall( forStmt->get_body() );
+                        } else if ( compoundStmt->get_kids().size() == 1 ) {
+                                // should be the call statement, but in any case there's only one option
+                                return getCtorDtorCall( compoundStmt->get_kids().front() );
+                        } else {
+                                assert( false && "too many statements in compoundStmt for getCtorDtorCall" );
+                        }
                 } if ( ImplicitCtorDtorStmt * impCtorDtorStmt = dynamic_cast< ImplicitCtorDtorStmt * > ( stmt ) ) {
                         return getCtorDtorCall( impCtorDtorStmt->get_callStmt() );

src/ResolvExpr/Resolver.cc

@@ -545 +545 @@
                         // get Variable <array>, then get the base type of the VariableExpr - this is the type that needs to be fixed
                         Expression * arr = InitTweak::getCallArg( plusExpr, 0 );
-                        assert( dynamic_cast< VariableExpr * >( arr ) );
+                        assert( dynamic_cast< VariableExpr * >( arr ) || dynamic_cast< MemberExpr *>( arr ) );
                         assert( arr && arr->get_results().size() == 1 );
                         type = arr->get_results().front()->clone();
@@ -554 +554 @@
                         assert( constructee->get_results().size() == 1 );
                         AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
-                        assert( addrExpr && addrExpr->get_results().size() == 1);
+                        assert( addrExpr && addrExpr->get_results().size() == 1 );
                         type = addrExpr->get_results().front()->clone();
                 }

src/SymTab/Autogen.cc

@@ -82 +82 @@
                 }
 
-                *out++ = new ExprStmt( noLabels, fExpr );
+                Statement * callStmt = new ExprStmt( noLabels, fExpr );
+                if ( (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) ) ) {
+                        // implicitly generated ctor/dtor calls should be wrapped
+                        // so that later passes are aware they were generated.
+                        // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
+                        // because this causes the address to be taken at codegen, which is illegal in C.
+                        callStmt = new ImplicitCtorDtorStmt( callStmt );
+                }
+                *out++ = callStmt;
         }
 
@@ -242 +250 @@
                                 }
 
-                                if ( type->get_qualifiers().isConst ) {
-                                        // don't assign const members
+                                if ( type->get_qualifiers().isConst && func->get_name() == "?=?" ) {
+                                        // don't assign const members, but do construct/destruct
                                         continue;
                                 }

src/SymTab/Autogen.h

@@ -91 +91 @@
     block->get_kids().push_back( new DeclStmt( noLabels, index ) );
     block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, new ExprStmt( noLabels, fExpr ) ) );
-    *out++ = block;
+
+    Statement * stmt = block;
+    if ( fname == "?{}" || fname == "^?{}" ) {
+      // implicitly generated ctor/dtor calls should be wrapped
+      // so that later passes are aware they were generated
+      stmt = new ImplicitCtorDtorStmt( stmt );
+    }
+    *out++ = stmt;
   }
 } // namespace SymTab

src/tests/.expect/extension.txt

@@ -20 +20 @@
 }
 static inline void ___constructor__F_P2sS_autogen___1(struct S *___dst__P2sS_1){
-    ((void)((*___dst__P2sS_1).__a__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__b__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__c__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__a__i_1)))) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__b__i_1)))) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__c__i_1)))) /* ?{} */);
 }
 static inline void ___constructor__F_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
-    ((void)((*___dst__P2sS_1).__a__i_1=___src__2sS_1.__a__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__b__i_1=___src__2sS_1.__b__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__c__i_1=___src__2sS_1.__c__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__a__i_1)))=___src__2sS_1.__a__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__b__i_1)))=___src__2sS_1.__b__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__c__i_1)))=___src__2sS_1.__c__i_1) /* ?{} */);
 }
 static inline void ___destructor__F_P2sS_autogen___1(struct S *___dst__P2sS_1){
-    ((void)((*___dst__P2sS_1).__c__i_1) /* ^?{} */);
-    ((void)((*___dst__P2sS_1).__b__i_1) /* ^?{} */);
-    ((void)((*___dst__P2sS_1).__a__i_1) /* ^?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__c__i_1)))) /* ^?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__b__i_1)))) /* ^?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__a__i_1)))) /* ^?{} */);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __a__i_1){
-    ((void)((*___dst__P2sS_1).__a__i_1=__a__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__b__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__c__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__a__i_1)))=__a__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__b__i_1)))) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__c__i_1)))) /* ?{} */);
 }
 static inline void ___constructor__F_P2sSii_autogen___1(struct S *___dst__P2sS_1, int __a__i_1, int __b__i_1){
-    ((void)((*___dst__P2sS_1).__a__i_1=__a__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__b__i_1=__b__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__c__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__a__i_1)))=__a__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__b__i_1)))=__b__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__c__i_1)))) /* ?{} */);
 }
 static inline void ___constructor__F_P2sSiii_autogen___1(struct S *___dst__P2sS_1, int __a__i_1, int __b__i_1, int __c__i_1){
-    ((void)((*___dst__P2sS_1).__a__i_1=__a__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__b__i_1=__b__i_1) /* ?{} */);
-    ((void)((*___dst__P2sS_1).__c__i_1=__c__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__a__i_1)))=__a__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__b__i_1)))=__b__i_1) /* ?{} */);
+    ((void)((*((int *)(&(*___dst__P2sS_1).__c__i_1)))=__c__i_1) /* ?{} */);
 }
 __extension__ union U {