Changeset bdad1679


Ignore:
Timestamp:
Mar 2, 2016, 4:59:34 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
8f610e85
Parents:
90c3b1c (diff), 540ddb7d (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

Location:
src
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • src/CodeGen/GenType.cc

    r90c3b1c rbdad1679  
    194194        void GenType::visit( VarArgsType *varArgsType ) {
    195195                typeString = "__builtin_va_list " + typeString;
    196                 // don't handle qualifiers, var args pack shouldn't have any
     196                handleQualifiers( varArgsType );
    197197        }
    198198
  • src/Makefile.in

    r90c3b1c rbdad1679  
    192192        SynTree/driver_cfa_cpp-Visitor.$(OBJEXT) \
    193193        SynTree/driver_cfa_cpp-Mutator.$(OBJEXT) \
    194         SynTree/driver_cfa_cpp-CodeGenVisitor.$(OBJEXT) \
    195194        SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
    196195        Tuples/driver_cfa_cpp-Mutate.$(OBJEXT) \
     
    381380        SynTree/NamedTypeDecl.cc SynTree/TypeDecl.cc \
    382381        SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \
    383         SynTree/CodeGenVisitor.cc SynTree/TypeSubstitution.cc \
    384         Tuples/Mutate.cc Tuples/AssignExpand.cc \
    385         Tuples/FunctionFixer.cc Tuples/TupleAssignment.cc \
    386         Tuples/FunctionChecker.cc Tuples/NameMatcher.cc
     382        SynTree/TypeSubstitution.cc Tuples/Mutate.cc \
     383        Tuples/AssignExpand.cc Tuples/FunctionFixer.cc \
     384        Tuples/TupleAssignment.cc Tuples/FunctionChecker.cc \
     385        Tuples/NameMatcher.cc
    387386MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
    388387        ${cfa_cpplib_PROGRAMS}}
     
    747746SynTree/driver_cfa_cpp-Mutator.$(OBJEXT): SynTree/$(am__dirstamp) \
    748747        SynTree/$(DEPDIR)/$(am__dirstamp)
    749 SynTree/driver_cfa_cpp-CodeGenVisitor.$(OBJEXT):  \
    750         SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
    751748SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT):  \
    752749        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
     
    847844        -rm -f SynTree/driver_cfa_cpp-AttrType.$(OBJEXT)
    848845        -rm -f SynTree/driver_cfa_cpp-BasicType.$(OBJEXT)
    849         -rm -f SynTree/driver_cfa_cpp-CodeGenVisitor.$(OBJEXT)
    850846        -rm -f SynTree/driver_cfa_cpp-CommaExpr.$(OBJEXT)
    851847        -rm -f SynTree/driver_cfa_cpp-CompoundStmt.$(OBJEXT)
     
    955951@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AttrType.Po@am__quote@
    956952@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-BasicType.Po@am__quote@
    957 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Po@am__quote@
    958953@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-CommaExpr.Po@am__quote@
    959954@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Po@am__quote@
     
    23482343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    23492344@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-Mutator.obj `if test -f 'SynTree/Mutator.cc'; then $(CYGPATH_W) 'SynTree/Mutator.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Mutator.cc'; fi`
    2350 
    2351 SynTree/driver_cfa_cpp-CodeGenVisitor.o: SynTree/CodeGenVisitor.cc
    2352 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-CodeGenVisitor.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Tpo -c -o SynTree/driver_cfa_cpp-CodeGenVisitor.o `test -f 'SynTree/CodeGenVisitor.cc' || echo '$(srcdir)/'`SynTree/CodeGenVisitor.cc
    2353 @am__fastdepCXX_TRUE@   $(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Po
    2354 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='SynTree/CodeGenVisitor.cc' object='SynTree/driver_cfa_cpp-CodeGenVisitor.o' libtool=no @AMDEPBACKSLASH@
    2355 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    2356 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-CodeGenVisitor.o `test -f 'SynTree/CodeGenVisitor.cc' || echo '$(srcdir)/'`SynTree/CodeGenVisitor.cc
    2357 
    2358 SynTree/driver_cfa_cpp-CodeGenVisitor.obj: SynTree/CodeGenVisitor.cc
    2359 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-CodeGenVisitor.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Tpo -c -o SynTree/driver_cfa_cpp-CodeGenVisitor.obj `if test -f 'SynTree/CodeGenVisitor.cc'; then $(CYGPATH_W) 'SynTree/CodeGenVisitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/CodeGenVisitor.cc'; fi`
    2360 @am__fastdepCXX_TRUE@   $(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-CodeGenVisitor.Po
    2361 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='SynTree/CodeGenVisitor.cc' object='SynTree/driver_cfa_cpp-CodeGenVisitor.obj' libtool=no @AMDEPBACKSLASH@
    2362 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    2363 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-CodeGenVisitor.obj `if test -f 'SynTree/CodeGenVisitor.cc'; then $(CYGPATH_W) 'SynTree/CodeGenVisitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/CodeGenVisitor.cc'; fi`
    23642345
    23652346SynTree/driver_cfa_cpp-TypeSubstitution.o: SynTree/TypeSubstitution.cc
  • src/ResolvExpr/PtrsCastable.cc

    r90c3b1c rbdad1679  
    116116
    117117        void PtrsCastable::visit(EnumInstType *inst) {
    118                 if ( dynamic_cast< EnumInstType* >( inst ) ) {
     118                if ( dynamic_cast< EnumInstType* >( dest ) ) {
    119119                        result = 1;
    120                 } else if ( BasicType *bt = dynamic_cast< BasicType* >( inst ) ) {
     120                } else if ( BasicType *bt = dynamic_cast< BasicType* >( dest ) ) {
    121121                        if ( bt->get_kind() == BasicType::SignedInt ) {
    122122                                result = 0;
  • src/SymTab/Mangler.cc

    r90c3b1c rbdad1679  
    227227
    228228        void Mangler::visit( VarArgsType *varArgsType ) {
     229                printQualifiers( varArgsType );
    229230                mangleName << "VARGS";
    230231        }
  • src/SymTab/TypeEquality.cc

    r90c3b1c rbdad1679  
    194194
    195195        void TypeEquality::visit( VarArgsType *varArgsType ) {
    196                 // don't handle qualifiers; var args pack shouldn't have any
     196                handleQualifiers( varArgsType );
    197197                if ( ! dynamic_cast< VarArgsType * >( other ) ) {
    198198                        result = false;
  • src/SynTree/Type.h

    r90c3b1c rbdad1679  
    404404  public:
    405405        VarArgsType();
     406        VarArgsType( Type::Qualifiers &tq );
    406407
    407408        virtual VarArgsType *clone() const { return new VarArgsType( *this ); }
  • src/SynTree/VarArgsType.cc

    r90c3b1c rbdad1679  
    1818VarArgsType::VarArgsType() : Type( Type::Qualifiers() ) {}
    1919
     20VarArgsType::VarArgsType( Type::Qualifiers &tq ) : Type( tq ) {}
     21
    2022void VarArgsType::print( std::ostream &os, int indent ) const {
    2123        Type::print( os, indent );
  • src/SynTree/module.mk

    r90c3b1c rbdad1679  
    4646       SynTree/Visitor.cc \
    4747       SynTree/Mutator.cc \
    48        SynTree/CodeGenVisitor.cc \
    4948       SynTree/TypeSubstitution.cc
    5049
Note: See TracChangeset for help on using the changeset viewer.