Changeset a200795


Ignore:
Timestamp:
Jan 29, 2019, 1:40:09 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
6a9d4b4
Parents:
cde3891 (diff), ede87c6 (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' into cleanup-dtors

Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rcde3891 ra200795  
    77node('master') {
    88        // Globals
    9         BuildDir  = null
    10         SrcDir    = null
     9        BuildDir  = pwd tmp: true
     10        SrcDir    = pwd tmp: false
    1111        Settings  = null
    1212        StageName = ''
     
    4646                                publish()
    4747                        }
     48
     49                        // Update the build directories when exiting the node
     50                        BuildDir  = pwd tmp: true
     51                        SrcDir    = pwd tmp: false
    4852
    4953                        notify_server(45)
     
    149153                dir (BuildDir) {
    150154                        //Append bench results
    151                         sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
     155                        sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
    152156                }
    153157        }
     
    175179
    176180                //Then publish the results
    177                 sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     181                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
    178182        }
    179183}
     
    185189        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
    186190
    187         sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
     191        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
    188192
    189193        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
     
    298302                switch( param.Architecture ) {
    299303                        case 'x64':
    300                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
     304                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
    301305                        break
    302306                        case 'x86':
    303                                 this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
     307                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
    304308                        break
    305309                        default :
     
    377381                ]])
    378382
     383        // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
     384        checkout scm
     385
    379386        final settings = new BuildSettings(params, env.BRANCH_NAME)
    380387
     
    404411        catch (Exception caughtError) {
    405412                err = caughtError //rethrow error later
    406                 sh 'cat *.log'
     413                sh 'cat build/*.log'
    407414        }
    408415        finally {
  • src/Makefile.am

    rcde3891 ra200795  
    2020
    2121SRC = main.cc \
    22       MakeLibCfa.cc \
    23       CompilationState.cc
     22                        MakeLibCfa.cc \
     23                        CompilationState.cc
    2424
    2525MAINTAINERCLEANFILES =
    26 MOSTLYCLEANFILES =
     26MOSTLYCLEANFILES = Parser/gcc-flags.h
    2727
    28 # Is there a way to use a variable for the directory names?
     28Parser/gcc-flags.h :
     29        ${AM_V_GEN}$(CC) -dM -E - < /dev/null | sed 's/define /define __GCC__/' > $(@)
     30
     31Parser/lex.ll : Parser/gcc-flags.h
    2932
    3033include CodeGen/module.mk
     
    5861
    5962noinst_LIBRARIES = libdemangle.a
    60 libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.cc \
    61   SynTree/Type.cc \
    62   SynTree/VoidType.cc \
    63   SynTree/BasicType.cc \
    64   SynTree/PointerType.cc \
    65   SynTree/ArrayType.cc \
    66   SynTree/ReferenceType.cc \
    67   SynTree/FunctionType.cc \
    68   SynTree/ReferenceToType.cc \
    69   SynTree/TupleType.cc \
    70   SynTree/TypeofType.cc \
    71   SynTree/AttrType.cc \
    72   SynTree/VarArgsType.cc \
    73   SynTree/ZeroOneType.cc \
    74   SynTree/Constant.cc \
    75   SynTree/Expression.cc \
    76   SynTree/TupleExpr.cc \
    77   SynTree/CommaExpr.cc \
    78   SynTree/TypeExpr.cc \
    79   SynTree/ApplicationExpr.cc \
    80   SynTree/AddressExpr.cc \
    81   SynTree/Statement.cc \
    82   SynTree/CompoundStmt.cc \
    83   SynTree/DeclStmt.cc \
    84   SynTree/Declaration.cc \
    85   SynTree/DeclarationWithType.cc \
    86   SynTree/ObjectDecl.cc \
    87   SynTree/FunctionDecl.cc \
    88   SynTree/AggregateDecl.cc \
    89   SynTree/NamedTypeDecl.cc \
    90   SynTree/TypeDecl.cc \
    91   SynTree/Initializer.cc \
    92   SynTree/TypeSubstitution.cc \
    93   SynTree/Attribute.cc \
    94   SynTree/DeclReplacer.cc \
    95   CompilationState.cc \
    96   CodeGen/CodeGenerator.cc \
    97   CodeGen/FixMain.cc \
    98   CodeGen/Generate.cc \
    99   CodeGen/GenType.cc \
    100   CodeGen/OperatorTable.cc \
    101   Common/Assert.cc \
    102   Common/Eval.cc \
    103   Common/SemanticError.cc \
    104   Common/UniqueName.cc \
    105   Concurrency/Keywords.cc \
    106   ControlStruct/ForExprMutator.cc \
    107   ControlStruct/LabelFixer.cc \
    108   ControlStruct/LabelGenerator.cc \
    109   ControlStruct/MLEMutator.cc \
    110   ControlStruct/Mutate.cc \
    111   GenPoly/GenPoly.cc \
    112   GenPoly/Lvalue.cc \
    113   InitTweak/GenInit.cc \
    114   InitTweak/InitTweak.cc \
    115   Parser/LinkageSpec.cc \
    116   ResolvExpr/AdjustExprType.cc \
    117   ResolvExpr/Alternative.cc \
    118   ResolvExpr/AlternativeFinder.cc \
    119   ResolvExpr/ExplodedActual.cc \
    120   ResolvExpr/CastCost.cc \
    121   ResolvExpr/CommonType.cc \
    122   ResolvExpr/ConversionCost.cc \
    123   ResolvExpr/CurrentObject.cc \
    124   ResolvExpr/FindOpenVars.cc \
    125   ResolvExpr/Occurs.cc \
    126   ResolvExpr/PolyCost.cc \
    127   ResolvExpr/PtrsAssignable.cc \
    128   ResolvExpr/PtrsCastable.cc \
    129   ResolvExpr/RenameVars.cc \
    130   ResolvExpr/ResolveAssertions.cc \
    131   ResolvExpr/Resolver.cc \
    132   ResolvExpr/ResolveTypeof.cc \
    133   ResolvExpr/SpecCost.cc \
    134   ResolvExpr/TypeEnvironment.cc \
    135   ResolvExpr/Unify.cc \
    136   SymTab/Autogen.cc \
    137   SymTab/FixFunction.cc \
    138   SymTab/Indexer.cc \
    139   SymTab/Mangler.cc \
    140   SymTab/Validate.cc \
    141   Tuples/Explode.cc \
    142   Tuples/TupleAssignment.cc \
    143   Tuples/TupleExpansion.cc \
    144   Validate/HandleAttributes.cc \
    145   Validate/FindSpecialDecls.cc
     63libdemangle_a_SOURCES = \
     64        SymTab/Demangle.cc \
     65        SymTab/ManglerCommon.cc \
     66        SynTree/Type.cc \
     67        SynTree/VoidType.cc \
     68        SynTree/BasicType.cc \
     69        SynTree/PointerType.cc \
     70        SynTree/ArrayType.cc \
     71        SynTree/ReferenceType.cc \
     72        SynTree/FunctionType.cc \
     73        SynTree/ReferenceToType.cc \
     74        SynTree/TupleType.cc \
     75        SynTree/TypeofType.cc \
     76        SynTree/AttrType.cc \
     77        SynTree/VarArgsType.cc \
     78        SynTree/ZeroOneType.cc \
     79        SynTree/Constant.cc \
     80        SynTree/Expression.cc \
     81        SynTree/TupleExpr.cc \
     82        SynTree/CommaExpr.cc \
     83        SynTree/TypeExpr.cc \
     84        SynTree/ApplicationExpr.cc \
     85        SynTree/AddressExpr.cc \
     86        SynTree/Statement.cc \
     87        SynTree/CompoundStmt.cc \
     88        SynTree/DeclStmt.cc \
     89        SynTree/Declaration.cc \
     90        SynTree/DeclarationWithType.cc \
     91        SynTree/ObjectDecl.cc \
     92        SynTree/FunctionDecl.cc \
     93        SynTree/AggregateDecl.cc \
     94        SynTree/NamedTypeDecl.cc \
     95        SynTree/TypeDecl.cc \
     96        SynTree/Initializer.cc \
     97        SynTree/TypeSubstitution.cc \
     98        SynTree/Attribute.cc \
     99        SynTree/DeclReplacer.cc \
     100        CompilationState.cc \
     101        CodeGen/CodeGenerator.cc \
     102        CodeGen/FixMain.cc \
     103        CodeGen/Generate.cc \
     104        CodeGen/GenType.cc \
     105        CodeGen/OperatorTable.cc \
     106        Common/Assert.cc \
     107        Common/Eval.cc \
     108        Common/SemanticError.cc \
     109        Common/UniqueName.cc \
     110        Concurrency/Keywords.cc \
     111        ControlStruct/ForExprMutator.cc \
     112        ControlStruct/LabelFixer.cc \
     113        ControlStruct/LabelGenerator.cc \
     114        ControlStruct/MLEMutator.cc \
     115        ControlStruct/Mutate.cc \
     116        GenPoly/GenPoly.cc \
     117        GenPoly/Lvalue.cc \
     118        InitTweak/GenInit.cc \
     119        InitTweak/InitTweak.cc \
     120        Parser/LinkageSpec.cc \
     121        ResolvExpr/AdjustExprType.cc \
     122        ResolvExpr/Alternative.cc \
     123        ResolvExpr/AlternativeFinder.cc \
     124        ResolvExpr/ExplodedActual.cc \
     125        ResolvExpr/CastCost.cc \
     126        ResolvExpr/CommonType.cc \
     127        ResolvExpr/ConversionCost.cc \
     128        ResolvExpr/CurrentObject.cc \
     129        ResolvExpr/FindOpenVars.cc \
     130        ResolvExpr/Occurs.cc \
     131        ResolvExpr/PolyCost.cc \
     132        ResolvExpr/PtrsAssignable.cc \
     133        ResolvExpr/PtrsCastable.cc \
     134        ResolvExpr/RenameVars.cc \
     135        ResolvExpr/ResolveAssertions.cc \
     136        ResolvExpr/Resolver.cc \
     137        ResolvExpr/ResolveTypeof.cc \
     138        ResolvExpr/SpecCost.cc \
     139        ResolvExpr/TypeEnvironment.cc \
     140        ResolvExpr/Unify.cc \
     141        SymTab/Autogen.cc \
     142        SymTab/FixFunction.cc \
     143        SymTab/Indexer.cc \
     144        SymTab/Mangler.cc \
     145        SymTab/Validate.cc \
     146        Tuples/Explode.cc \
     147        Tuples/TupleAssignment.cc \
     148        Tuples/TupleExpansion.cc \
     149        Validate/HandleAttributes.cc \
     150        Validate/FindSpecialDecls.cc
     151
    146152
    147153MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
  • src/Makefile.in

    rcde3891 ra200795  
    620620        Validate/FindSpecialDecls.cc Virtual/ExpandCasts.cc
    621621MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
    622 MOSTLYCLEANFILES = Parser/parser.hh Parser/parser.output
     622MOSTLYCLEANFILES = Parser/gcc-flags.h Parser/lex.cc Parser/parser.cc \
     623        Parser/parser.hh Parser/parser.output
    623624BUILT_SOURCES = Parser/parser.hh
    624625AM_YFLAGS = -d -t -v
    625 
    626 # Is there a way to use a variable for the directory names?
    627626
    628627# put into lib for now
     
    636635demangler_LDADD = libdemangle.a     # yywrap
    637636noinst_LIBRARIES = libdemangle.a
    638 libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.cc \
    639   SynTree/Type.cc \
    640   SynTree/VoidType.cc \
    641   SynTree/BasicType.cc \
    642   SynTree/PointerType.cc \
    643   SynTree/ArrayType.cc \
    644   SynTree/ReferenceType.cc \
    645   SynTree/FunctionType.cc \
    646   SynTree/ReferenceToType.cc \
    647   SynTree/TupleType.cc \
    648   SynTree/TypeofType.cc \
    649   SynTree/AttrType.cc \
    650   SynTree/VarArgsType.cc \
    651   SynTree/ZeroOneType.cc \
    652   SynTree/Constant.cc \
    653   SynTree/Expression.cc \
    654   SynTree/TupleExpr.cc \
    655   SynTree/CommaExpr.cc \
    656   SynTree/TypeExpr.cc \
    657   SynTree/ApplicationExpr.cc \
    658   SynTree/AddressExpr.cc \
    659   SynTree/Statement.cc \
    660   SynTree/CompoundStmt.cc \
    661   SynTree/DeclStmt.cc \
    662   SynTree/Declaration.cc \
    663   SynTree/DeclarationWithType.cc \
    664   SynTree/ObjectDecl.cc \
    665   SynTree/FunctionDecl.cc \
    666   SynTree/AggregateDecl.cc \
    667   SynTree/NamedTypeDecl.cc \
    668   SynTree/TypeDecl.cc \
    669   SynTree/Initializer.cc \
    670   SynTree/TypeSubstitution.cc \
    671   SynTree/Attribute.cc \
    672   SynTree/DeclReplacer.cc \
    673   CompilationState.cc \
    674   CodeGen/CodeGenerator.cc \
    675   CodeGen/FixMain.cc \
    676   CodeGen/Generate.cc \
    677   CodeGen/GenType.cc \
    678   CodeGen/OperatorTable.cc \
    679   Common/Assert.cc \
    680   Common/Eval.cc \
    681   Common/SemanticError.cc \
    682   Common/UniqueName.cc \
    683   Concurrency/Keywords.cc \
    684   ControlStruct/ForExprMutator.cc \
    685   ControlStruct/LabelFixer.cc \
    686   ControlStruct/LabelGenerator.cc \
    687   ControlStruct/MLEMutator.cc \
    688   ControlStruct/Mutate.cc \
    689   GenPoly/GenPoly.cc \
    690   GenPoly/Lvalue.cc \
    691   InitTweak/GenInit.cc \
    692   InitTweak/InitTweak.cc \
    693   Parser/LinkageSpec.cc \
    694   ResolvExpr/AdjustExprType.cc \
    695   ResolvExpr/Alternative.cc \
    696   ResolvExpr/AlternativeFinder.cc \
    697   ResolvExpr/ExplodedActual.cc \
    698   ResolvExpr/CastCost.cc \
    699   ResolvExpr/CommonType.cc \
    700   ResolvExpr/ConversionCost.cc \
    701   ResolvExpr/CurrentObject.cc \
    702   ResolvExpr/FindOpenVars.cc \
    703   ResolvExpr/Occurs.cc \
    704   ResolvExpr/PolyCost.cc \
    705   ResolvExpr/PtrsAssignable.cc \
    706   ResolvExpr/PtrsCastable.cc \
    707   ResolvExpr/RenameVars.cc \
    708   ResolvExpr/ResolveAssertions.cc \
    709   ResolvExpr/Resolver.cc \
    710   ResolvExpr/ResolveTypeof.cc \
    711   ResolvExpr/SpecCost.cc \
    712   ResolvExpr/TypeEnvironment.cc \
    713   ResolvExpr/Unify.cc \
    714   SymTab/Autogen.cc \
    715   SymTab/FixFunction.cc \
    716   SymTab/Indexer.cc \
    717   SymTab/Mangler.cc \
    718   SymTab/Validate.cc \
    719   Tuples/Explode.cc \
    720   Tuples/TupleAssignment.cc \
    721   Tuples/TupleExpansion.cc \
    722   Validate/HandleAttributes.cc \
    723   Validate/FindSpecialDecls.cc
     637libdemangle_a_SOURCES = \
     638        SymTab/Demangle.cc \
     639        SymTab/ManglerCommon.cc \
     640        SynTree/Type.cc \
     641        SynTree/VoidType.cc \
     642        SynTree/BasicType.cc \
     643        SynTree/PointerType.cc \
     644        SynTree/ArrayType.cc \
     645        SynTree/ReferenceType.cc \
     646        SynTree/FunctionType.cc \
     647        SynTree/ReferenceToType.cc \
     648        SynTree/TupleType.cc \
     649        SynTree/TypeofType.cc \
     650        SynTree/AttrType.cc \
     651        SynTree/VarArgsType.cc \
     652        SynTree/ZeroOneType.cc \
     653        SynTree/Constant.cc \
     654        SynTree/Expression.cc \
     655        SynTree/TupleExpr.cc \
     656        SynTree/CommaExpr.cc \
     657        SynTree/TypeExpr.cc \
     658        SynTree/ApplicationExpr.cc \
     659        SynTree/AddressExpr.cc \
     660        SynTree/Statement.cc \
     661        SynTree/CompoundStmt.cc \
     662        SynTree/DeclStmt.cc \
     663        SynTree/Declaration.cc \
     664        SynTree/DeclarationWithType.cc \
     665        SynTree/ObjectDecl.cc \
     666        SynTree/FunctionDecl.cc \
     667        SynTree/AggregateDecl.cc \
     668        SynTree/NamedTypeDecl.cc \
     669        SynTree/TypeDecl.cc \
     670        SynTree/Initializer.cc \
     671        SynTree/TypeSubstitution.cc \
     672        SynTree/Attribute.cc \
     673        SynTree/DeclReplacer.cc \
     674        CompilationState.cc \
     675        CodeGen/CodeGenerator.cc \
     676        CodeGen/FixMain.cc \
     677        CodeGen/Generate.cc \
     678        CodeGen/GenType.cc \
     679        CodeGen/OperatorTable.cc \
     680        Common/Assert.cc \
     681        Common/Eval.cc \
     682        Common/SemanticError.cc \
     683        Common/UniqueName.cc \
     684        Concurrency/Keywords.cc \
     685        ControlStruct/ForExprMutator.cc \
     686        ControlStruct/LabelFixer.cc \
     687        ControlStruct/LabelGenerator.cc \
     688        ControlStruct/MLEMutator.cc \
     689        ControlStruct/Mutate.cc \
     690        GenPoly/GenPoly.cc \
     691        GenPoly/Lvalue.cc \
     692        InitTweak/GenInit.cc \
     693        InitTweak/InitTweak.cc \
     694        Parser/LinkageSpec.cc \
     695        ResolvExpr/AdjustExprType.cc \
     696        ResolvExpr/Alternative.cc \
     697        ResolvExpr/AlternativeFinder.cc \
     698        ResolvExpr/ExplodedActual.cc \
     699        ResolvExpr/CastCost.cc \
     700        ResolvExpr/CommonType.cc \
     701        ResolvExpr/ConversionCost.cc \
     702        ResolvExpr/CurrentObject.cc \
     703        ResolvExpr/FindOpenVars.cc \
     704        ResolvExpr/Occurs.cc \
     705        ResolvExpr/PolyCost.cc \
     706        ResolvExpr/PtrsAssignable.cc \
     707        ResolvExpr/PtrsCastable.cc \
     708        ResolvExpr/RenameVars.cc \
     709        ResolvExpr/ResolveAssertions.cc \
     710        ResolvExpr/Resolver.cc \
     711        ResolvExpr/ResolveTypeof.cc \
     712        ResolvExpr/SpecCost.cc \
     713        ResolvExpr/TypeEnvironment.cc \
     714        ResolvExpr/Unify.cc \
     715        SymTab/Autogen.cc \
     716        SymTab/FixFunction.cc \
     717        SymTab/Indexer.cc \
     718        SymTab/Mangler.cc \
     719        SymTab/Validate.cc \
     720        Tuples/Explode.cc \
     721        Tuples/TupleAssignment.cc \
     722        Tuples/TupleExpansion.cc \
     723        Validate/HandleAttributes.cc \
     724        Validate/FindSpecialDecls.cc
    724725
    725726all: $(BUILT_SOURCES)
     
    15661567
    15671568
     1569Parser/gcc-flags.h :
     1570        ${AM_V_GEN}$(CC) -dM -E - < /dev/null | sed 's/define /define __GCC__/' > $(@)
     1571
     1572Parser/lex.ll : Parser/gcc-flags.h
     1573
    15681574# Tell versions [3.59,3.63) of GNU make to not export all variables.
    15691575# Otherwise a system limit (for SysV at least) may be exceeded.
  • src/Parser/module.mk

    rcde3891 ra200795  
    3131       Parser/parserutility.cc
    3232
    33 MOSTLYCLEANFILES += Parser/parser.hh Parser/parser.output
     33MOSTLYCLEANFILES += Parser/lex.cc Parser/parser.cc Parser/parser.hh Parser/parser.output
  • tools/PrettyGitLogs.sh

    rcde3891 ra200795  
    33set -e
    44
    5 GIT_UPDATE="$1/GIT_UPDATE"
    6 GIT_LOG="$1/GIT_LOG"
    7 GIT_DIFF="$1/GIT_DIFF"
     5GIT="git --git-dir=$1/.git"
     6
     7GIT_UPDATE="$2/GIT_UPDATE"
     8GIT_LOG="$2/GIT_LOG"
     9GIT_DIFF="$2/GIT_DIFF"
    810
    911rm -f ${GIT_UPDATE}  ${GIT_LOG}  ${GIT_DIFF}
    1012
    11 GitOldRef=$2
    12 GitNewRef=$3
     13GitOldRef=$3
     14GitNewRef=$4
    1315
    1416
Note: See TracChangeset for help on using the changeset viewer.