Changeset a951171


Ignore:
Timestamp:
Sep 18, 2020, 1:25:00 PM (13 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r673eb7a ra951171  
    102102
    103103                echo GitLogMessage()
    104 
    105                 // This is a complete hack but it solves problems with automake thinking it needs to regenerate makefiles
    106                 // We fudged automake/missing to handle that but automake stills bakes prints inside the makefiles
    107                 // and these cause more problems.
    108                 sh 'find . -name Makefile.in -exec touch {} +'
    109104        }
    110105}
     
    465460                                        description: 'Which compiler to use',                                   \
    466461                                        name: 'Compiler',                                                                       \
    467                                         choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',                                   \
     462                                        choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',   \
    468463                                        defaultValue: 'gcc-8',                                                          \
    469464                                ],                                                                                              \
  • src/Common/Stats/Stats.cc

    r673eb7a ra951171  
    3535        }
    3636
     37        namespace ResolveTime {
     38                bool enabled = false;
     39        }
     40
    3741        struct {
    3842                const char * const opt;
     
    4347                { "heap"    , Heap::enabled },
    4448                { "time"    , Time::enabled },
     49                { "resolve" , ResolveTime::enabled },
    4550        };
    4651
  • src/Common/module.mk

    r673eb7a ra951171  
    4040      Common/Stats/Heap.cc \
    4141      Common/Stats/Heap.h \
     42      Common/Stats/ResolveTime.cc \
     43      Common/Stats/ResolveTime.h \
    4244      Common/Stats/Stats.cc \
    4345      Common/Stats/Time.cc \
  • src/ResolvExpr/Resolver.cc

    r673eb7a ra951171  
    3838#include "Common/PassVisitor.h"          // for PassVisitor
    3939#include "Common/SemanticError.h"        // for SemanticError
     40#include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
    4041#include "Common/utility.h"              // for ValueGuard, group_iterate
    4142#include "InitTweak/GenInit.h"
     
    11691170                        const ast::Expr * untyped, const ast::SymbolTable & symtab
    11701171                ) {
    1171                         return findKindExpression( untyped, symtab );
     1172                        Stats::ResolveTime::start( untyped );
     1173                        auto res = findKindExpression( untyped, symtab );
     1174                        Stats::ResolveTime::stop();
     1175                        return res;
    11721176                }
    11731177        } // anonymous namespace
  • tests/Makefile.am

    r673eb7a ra951171  
    114114        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
    115115        $(CFACCLINK) ${@}.o -o $(abspath ${@})
     116        rm $(abspath ${@}).o
    116117
    117118# implicit rule for c++ test
     
    182183        $(CFACOMPILETEST) -O0 -c -o $(abspath ${@}).o
    183184        $(CFACCLINK)  -O0 ${@}.o -o $(abspath ${@})
     185        rm $(abspath ${@}).o
    184186
    185187#------------------------------------------------------------------------------
  • tests/linking/.expect/linkerror.txt

    r673eb7a ra951171  
    1 CFA Version 1.0.0 (debug)
    21linking/linkerror.o: In function `_X4mainFi___1':
    32linking/linkerror.cfa:6: undefined reference to `_X18this_doesnot_existFv_i__1'
Note: See TracChangeset for help on using the changeset viewer.