Changeset a951171

Timestamp:

Sep 18, 2020, 1:25:00 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0519e34

Parents:

673eb7a (diff), 57e0289 (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) (2 diffs)
• src/Common/Stats/ResolveTime.cc (added)
• src/Common/Stats/ResolveTime.h (added)
• src/Common/Stats/Stats.cc (modified) (2 diffs)
• src/Common/module.mk (modified) (1 diff)
• src/ResolvExpr/Resolver.cc (modified) (2 diffs)
• tests/Makefile.am (modified) (2 diffs)
• tests/linking/.expect/linkerror.txt (modified) (1 diff)

Jenkinsfile

@@ -102 +102 @@
 
                 echo GitLogMessage()
-
-                // This is a complete hack but it solves problems with automake thinking it needs to regenerate makefiles
-                // We fudged automake/missing to handle that but automake stills bakes prints inside the makefiles
-                // and these cause more problems.
-                sh 'find . -name Makefile.in -exec touch {} +'
         }
 }
@@ -465 +460 @@
                                         description: 'Which compiler to use',                                   \
                                         name: 'Compiler',                                                                       \
-                                        choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',                                   \
+                                        choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',   \
                                         defaultValue: 'gcc-8',                                                          \
                                 ],                                                                                              \

src/Common/Stats/Stats.cc

@@ -35 +35 @@
         }
 
+        namespace ResolveTime {
+                bool enabled = false;
+        }
+
         struct {
                 const char * const opt;
@@ -43 +47 @@
                 { "heap"    , Heap::enabled },
                 { "time"    , Time::enabled },
+                { "resolve" , ResolveTime::enabled },
         };
 

src/Common/module.mk

@@ -40 +40 @@
       Common/Stats/Heap.cc \
       Common/Stats/Heap.h \
+      Common/Stats/ResolveTime.cc \
+      Common/Stats/ResolveTime.h \
       Common/Stats/Stats.cc \
       Common/Stats/Time.cc \

src/ResolvExpr/Resolver.cc

@@ -38 +38 @@
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
+#include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
 #include "Common/utility.h"              // for ValueGuard, group_iterate
 #include "InitTweak/GenInit.h"
@@ -1169 +1170 @@
                         const ast::Expr * untyped, const ast::SymbolTable & symtab
                 ) {
-                        return findKindExpression( untyped, symtab );
+                        Stats::ResolveTime::start( untyped );
+                        auto res = findKindExpression( untyped, symtab );
+                        Stats::ResolveTime::stop();
+                        return res;
                 }
         } // anonymous namespace

tests/Makefile.am

@@ -114 +114 @@
         $(CFACOMPILETEST) -c -o $(abspath ${@}).o
         $(CFACCLINK) ${@}.o -o $(abspath ${@})
+        rm $(abspath ${@}).o
 
 # implicit rule for c++ test
@@ -182 +183 @@
         $(CFACOMPILETEST) -O0 -c -o $(abspath ${@}).o
         $(CFACCLINK)  -O0 ${@}.o -o $(abspath ${@})
+        rm $(abspath ${@}).o
 
 #------------------------------------------------------------------------------

tests/linking/.expect/linkerror.txt

@@ -1 @@
-CFA Version 1.0.0 (debug)
 linking/linkerror.o: In function `_X4mainFi___1':
 linking/linkerror.cfa:6: undefined reference to `_X18this_doesnot_existFv_i__1'