Changeset f9a7cf0 for src

Timestamp:

Jun 10, 2019, 1:48:33 PM (5 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:

6949c45

Parents:

2d11663 (diff), 6e3e0717 (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/Convert.cpp (modified) (12 diffs)
• AST/Pass.hpp (modified) (1 diff)
• Parser/parser.yy (modified) (6 diffs)
• main.cc (modified) (2 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 06 19:51:00 2019
-// Update Count     : 10
+// Last Modified On : Man Jun 10 11:51:00 2019
+// Update Count     : 11
 //
 
@@ -92 +92 @@
 
         Label makeLabel(Statement * labelled, const ast::Label& label) {
+                // This probably will leak memory, but only until we get rid of the old tree.
+                if ( nullptr == labelled && label.location.isSet() ) {
+                        labelled = new NullStmt();
+                        labelled->location = label.location;
+                }
                 return Label(
                         label.name,
@@ -154 +159 @@
                 auto&& attr = get<Attribute>().acceptL( node->attributes );
                 if ( inCache( node ) ) {
-                        if(node->name == "tmp") {
-                                std::cerr << (void*)node << "(new) in cache " << (void*)this->node << "(old)" << std::endl;
-                        }
                         return nullptr;
                 }
@@ -169 +171 @@
                         Type::FuncSpecifiers( node->funcSpec.val )
                 );
-                if(node->name == "tmp") {
-                        std::cerr << (void*)node << "(new) created " << (void*)decl << "(old)" << std::endl;
-                }
                 return declWithTypePostamble( decl, node );
         }
@@ -1390 +1389 @@
         // Local Utilities:
 
-        #define construct(T, key, ...) ({ \
-                void * data = ::operator new(sizeof(T)); \
-                cache.emplace( key, (T*)data ); \
-                new (data) T( __VA_ARGS__ ); \
-        })
-
         template<typename NewT, typename OldT>
         NewT * getAccept1( OldT old ) {
@@ -1409 +1402 @@
 
         template<typename NewT, typename OldC>
-        std::vector< ast::ptr<NewT> > getAcceptV( OldC& old ) {
+        std::vector< ast::ptr<NewT> > getAcceptV( const OldC& old ) {
                 std::vector< ast::ptr<NewT> > ret;
                 ret.reserve( old.size() );
@@ -1422 +1415 @@
 #       define GET_ACCEPT_V(child, type) \
                 getAcceptV< ast::type, decltype( old->child ) >( old->child )
-        
+
         template<typename NewT, typename OldC>
-        std::deque< ast::ptr<NewT> > getAcceptD( OldC& old ) {
+        std::deque< ast::ptr<NewT> > getAcceptD( const OldC& old ) {
                 std::deque< ast::ptr<NewT> > ret;
                 for ( auto a : old ) {
@@ -1437 +1430 @@
                 getAcceptD< ast::type, decltype( old->child ) >( old->child )
 
-        ast::Label make_label(Label* old) {
+        ast::Label make_label(const Label* old) {
+                CodeLocation const & location =
+                    ( old->labelled ) ? old->labelled->location : CodeLocation();
                 return ast::Label(
-                        old->labelled->location,
+                        location,
                         old->name,
                         GET_ACCEPT_V(attributes, Attribute)
@@ -1470 +1465 @@
 
         virtual void visit( ObjectDecl * old ) override final {
-                if( old->name == "tmp" ) {
-                        std::cerr << "building parameters for" << (void*)old << std::endl;
-                }
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& init = GET_ACCEPT_1(init, Init);
                 auto&& bfwd = GET_ACCEPT_1(bitfieldWidth, Expr);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
-                if( old->name == "tmp" ) {
-                        std::cerr << "checking cache for " << (void*)old << std::endl;
-                }
                 if ( inCache( old ) ) {
-                        if( old->name == "tmp" ) {
-                                std::cerr << (void*)old << "(old) in cache " << (void*)this->node << "(new)" << std::endl;
-                        }
                         return;
                 }
@@ -1498 +1484 @@
                 );
                 cache.emplace(old, decl);
-                if( old->name == "tmp" ) {
-                        std::cerr << (void*)old << "(old) added to cache with " << (void*)decl << "(new)" << std::endl;
-                }
                 assert(cache.find( old ) != cache.end());
                 decl->scopeLevel = old->scopeLevel;
@@ -1509 +1492 @@
 
                 this->node = decl;
-
-                if( old->name == "tmp" ) {
-                        std::cerr << (void*)old << "(old) created " << (void*)this->node << "(new)" << std::endl;
-                }
         }
 
@@ -1827 +1806 @@
                         }
 
-                        Label label = old->originalTarget;
                         auto stmt = new ast::BranchStmt(
                                 old->location,
                                 kind,
-                                make_label(&label),
+                                make_label(&old->originalTarget),
                                 GET_LABELS_V(old->labels)
                         );

src/AST/Pass.hpp

@@ -262 +262 @@
 /// Used to restore values/functions/etc. when the Pass finishes visiting this node
 class WithGuards {
-        __pass::at_cleanup_t at_cleanup;
-
+        __pass::at_cleanup_t at_cleanup = [](__pass::cleanup_func_t, void*) {
+                std::cerr << "No cleanup function was set" << std::endl;
+                abort();
+        };
+
+        template< typename pass_t>
+        friend auto __pass::at_cleanup( pass_t & pass, int ) -> decltype( &pass.at_cleanup );
 public:
+
         /// When this node is finished being visited, restore the value of a variable
         template< typename T >

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 15 21:25:27 2019
-// Update Count     : 4296
+// Last Modified On : Tue May 28 17:06:37 2019
+// Update Count     : 4354
 //
 
@@ -278 +278 @@
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
 %token SIZEOF OFFSETOF
+// %token SUSPEND RESUME                                                                        // CFA
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
@@ -482 +483 @@
 %precedence '}'
 %precedence '('
+
+// %precedence RESUME
+// %precedence '{'
+// %precedence ')'
 
 %locations                                                                                              // support location tracking for error messages
@@ -599 +604 @@
                         $$ = new ExpressionNode( $5 );
                 }
+        // | RESUME '(' comma_expression ')'
+        //      { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; }
+        // | RESUME '(' comma_expression ')' compound_statement
+        //      { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -1263 +1272 @@
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
-        | RETURN '{' initializer_list_opt comma_opt '}'
+        | RETURN '{' initializer_list_opt comma_opt '}' ';'
                 { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
+        // | SUSPEND ';'
+        //      { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+        // | SUSPEND compound_statement ';'
+        //      { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
@@ -2158 +2171 @@
 
 bit_subrange_size:
-        ':' constant_expression
+        ':' assignment_expression
                 { $$ = $2; }
         ;

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  5 13:48:41 2019
-// Update Count     : 600
+// Last Modified On : Wed Jun  5 20:35:13 2019
+// Update Count     : 601
 //
 
@@ -162 +162 @@
         backtrace( 6 );                                                                         // skip first 6 stack frames
         signal( SIGABRT, SIG_DFL);                                                      // reset default signal handler
-                raise( SIGABRT );                                                                       // reraise SIGABRT
+        raise( SIGABRT );                                                                       // reraise SIGABRT
 } // sigAbortHandler