Changeset 216597d

Timestamp:

Sep 10, 2019, 9:01:44 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

aced69a, c2051e10

Parents:

0bf5340 (diff), 3ce2425 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• Jenkinsfile (modified) (1 diff)
• src/ResolvExpr/Unify.cc (modified) (4 diffs)
• src/SynTree/Type.h (modified) (2 diffs)
• tests/pybin/tools.py (modified) (1 diff)

Jenkinsfile

@@ -155 +155 @@
 
 def test() {
-        build_stage('Test: short', !Settings.RunAllTests) {
+        try {
+                build_stage('Test: short', !Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                //Run the tests from the tests directory
+                                sh "make --no-print-directory -C tests archiveerrors=${BuildDir}/tests/crashes/short"
+                        }
+                }
+
+                build_stage('Test: full', Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                        //Run the tests from the tests directory
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
+                        }
+                }
+        }
+        catch (Exception err) {
+                echo "Archiving core dumps"
                 dir (BuildDir) {
-                        //Run the tests from the tests directory
-                        sh 'make --no-print-directory -C tests'
-                }
-        }
-
-        build_stage('Test: full', Settings.RunAllTests) {
-                dir (BuildDir) {
-                        //Run the tests from the tests directory
-                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes'
-                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no '
-                }
+                        archiveArtifacts artifacts: "tests/crashes/**/*", fingerprint: true
+                }
+                throw err
         }
 }

src/ResolvExpr/Unify.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 43
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 10:00:00 2019
+// Update Count     : 44
 //
 
@@ -278 +278 @@
 #endif
                         if ( ( common = commonType( type1, type2, widen.first, widen.second, indexer, env, openVars ) ) ) {
-                                common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
 #ifdef DEBUG
                                 std::cerr << "unifyInexact: common type is ";
@@ -295 +295 @@
                                 if ( ( tq1 > tq2 || widen.first ) && ( tq2 > tq1 || widen.second ) ) {
                                         common = type1->clone();
-                                        common->get_qualifiers() = tq1 | tq2;
+                                        common->tq = tq1.unify( tq2 );
                                         result = true;
                                 } else {
@@ -302 +302 @@
                         } else {
                                 common = type1->clone();
-                                common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
                                 result = true;
                         } // if

src/SynTree/Type.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 14 17:11:24 2019
-// Update Count     : 169
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 09:58:00 2019
+// Update Count     : 170
 //
 
@@ -131 +131 @@
                 bool operator>( Qualifiers other ) const { return *this != other && *this >= other; }
                 BFCommon( Qualifiers, NumTypeQualifier )
+
+                Qualifiers unify( Qualifiers const & other ) const {
+                        int or_flags = Mask & (val | other.val);
+                        int and_flags = val & other.val;
+                        return Qualifiers( or_flags | and_flags );
+                }
         }; // Qualifiers
 

tests/pybin/tools.py

@@ -311 +311 @@
 
 def core_archive(dst, name, exe):
-        # Get the files to copy
+        # Get the core dump
         core = os.path.join(os.getcwd(), "core" )
 
-        # Uncomment if we want timestamps on coredumps
-        # dst  = os.path.join(dst, "%s_%s" % (name, pretty_now()))
+        # update the path for this test
+        dst  = os.path.join(dst, name)
 
         # make a directory for this test
+        # mkdir makes the parent directory only so add a dummy
         mkdir(os.path.join(dst, "dir"))