Changeset 05d55ff for src

Timestamp:

Jun 7, 2019, 4:15:03 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

2d11663, 46438e4

Parents:

60aaa51d (diff), be8518f (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

Location:

src

Files:

• AST/AssertAcyclic.cpp (modified) (3 diffs)
• AST/AssertAcyclic.hpp (modified) (2 diffs)
• AST/Convert.cpp (modified) (5 diffs)
• AST/Pass.hpp (modified) (1 diff)
• CodeGen/CodeGenerator.cc (modified) (1 diff)
• Common/Indenter.h (modified) (2 diffs)
• GenPoly/Lvalue.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)

src/AST/AssertAcyclic.cpp

@@ -10 +10 @@
 // Created On       : Thu Jun 06 15:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun 06 15:00:00 2019
-// Update Count     : 0
+// Last Modified On : Fri Jun 07 14:32:00 2019
+// Update Count     : 1
 //
 
@@ -20 +20 @@
 namespace {
 
-class NoStrongCyclesCore : public ast::WithGuards {
+class NoStrongCyclesCore {
     std::vector<const ast::Node *> parents;
 public:
-        void previsit ( const ast::Node * node ) {
-                for (auto & p : parents) {
-                        assert(p != node);
+        void previsit( const ast::Node * node ) {
+                for (auto & parent : parents) {
+                        assert(parent != node);
                 }
                 parents.push_back(node);
-                GuardAction( [this]() { parents.pop_back(); } );
+        }
+        void postvisit( const ast::Node * ) {
+                parents.pop_back();
         }
 };
@@ -36 +38 @@
 namespace ast {
 
-void assertAcyclic( const std::list< ast::ptr< ast::Decl > > translationUnit ) {
+void assertAcyclic( const std::list< ast::ptr< ast::Decl > > & translationUnit ) {
         Pass<NoStrongCyclesCore> visitor;
         for ( auto & decl : translationUnit ) {

src/AST/AssertAcyclic.hpp

@@ -8 +8 @@
 //
 // Author           : Andrew Beach
-// Created On       : Thr May 6 15:00:00 2019
+// Created On       : Thr Jun  6 15:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 6 15:00:00 2019
-// Update Count     : 0
+// Last Modified On : Fri Jun  7 14:32:00 2019
+// Update Count     : 1
 //
 
@@ -25 +25 @@
 namespace ast {
 
-void assertAcyclic( const std::list< ast::ptr< ast::Decl > > translationUnit );
+void assertAcyclic( const std::list< ast::ptr< ast::Decl > > & translationUnit );
 
 }

src/AST/Convert.cpp

@@ -736 +736 @@
                 expr->var = get<DeclarationWithType>().accept1(node->var);
                 Type * type = expr->var->get_type()->clone();
+                if(FunctionType * ft = dynamic_cast<FunctionType*>(type)) {
+                        if(node->result.as<ast::PointerType>()) {
+                                type = new PointerType({}, ft);
+                        }
+                }
+
                 type->set_lvalue( true );
-                expr->set_result( type );
+                expr->result = type ;
                 this->node = expr;
                 return nullptr;
@@ -783 +789 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new SizeofExpr(
                                 get<Type>().accept1(node->type)
@@ -804 +811 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new AlignofExpr(
                                 get<Type>().accept1(node->type)
@@ -2164 +2172 @@
                 );
 
-                visitBaseExpr( old,
+                visitBaseExpr_SkipResultType( old,
                         expr
                 );
@@ -2170 +2178 @@
                 expr->var = GET_ACCEPT_1(var, DeclWithType);
                 expr->result = expr->var->get_type();
+                if(const ast::FunctionType * ft = expr->result.as<ast::FunctionType>()) {
+                        if(dynamic_cast<PointerType *>(old->result)) {
+                                expr->result = new ast::PointerType(ft);
+                        }
+                }
                 add_qualifiers( expr->result, ast::CV::Lvalue );
                 this->node = expr;

src/AST/Pass.hpp

@@ -287 +287 @@
                 at_cleanup( [func](void *) { func(); }, nullptr );
         }
+
+        /// When this node is finished being visited, call a member of an object.
+        template<typename T>
+        void GuardMethod( T * obj, void (T::*method)() ) {
+                at_cleanup( [ method ]( void * object ) {
+                        static_cast< T * >( object )->method();
+                }, static_cast< void * >( obj ) );
+        }
 };
 

src/CodeGen/CodeGenerator.cc

@@ -116 +116 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), options( pretty, genC, lineMarks, printExprTypes ), endl( *this ) {}
-        CodeGenerator::CodeGenerator( std::ostream & os, const Options &options ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), options(options), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( 0, CodeGenerator::tabsize ), output( os ), printLabels( *this ), options( pretty, genC, lineMarks, printExprTypes ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, const Options &options ) : indent( 0, CodeGenerator::tabsize ), output( os ), printLabels( *this ), options(options), endl( *this ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {

src/Common/Indenter.h

@@ -23 +23 @@
         unsigned int amt;         ///< spaces in one level of indentation
 
-        Indenter( unsigned int indent = 0, unsigned int amt = tabsize ) 
-        : indent( indent*amt ), amt( amt ) {}
-        
-        Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
-        Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
+        Indenter( unsigned int indent = 0, unsigned int amt = tabsize )
+        : indent( indent ), amt( amt ) {}
+
+        Indenter & operator+=(int nlevels) { indent += nlevels; return *this; }
+        Indenter & operator-=(int nlevels) { indent -= nlevels; return *this; }
         Indenter operator+(int nlevels) { Indenter indenter = *this; return indenter += nlevels; }
         Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
@@ -35 +35 @@
 
 inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
-        return out << std::string(indent.indent, ' ');
+        return out << std::string(indent.indent * indent.amt, ' ');
 }
 

src/GenPoly/Lvalue.cc

@@ -196 +196 @@
                                 unsigned int i = 0;
                                 const unsigned int end = ftype->parameters.size();
+
+                                /// The for loop may eagerly dereference the iterators and fail on empty lists
+                                if(i == end) { return appExpr; }
                                 for ( auto p : unsafe_group_iterate( appExpr->args, ftype->parameters ) ) {
                                         if (i == end) break;

src/InitTweak/FixInit.cc

@@ -301 +301 @@
                                 replacement = new CastExpr( replacement, base->clone() );
                         }
-                        size_t replaced = DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
-                        if(replaced == 0) {
-                                objDecl->print(std::cerr);
-                                std::cerr << "-----" << std::endl;
-                                dtor->print(std::cerr);
-                                std::cerr << "Failed to replace " << objDecl << std::endl;
-                                abort();
-                        }
+                        DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
                         dtorFunc->statements->push_back( strict_dynamic_cast<Statement *>( dtor ) );