Changeset 3b56166 for src/Concurrency/Keywords.cc

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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

File:

• src/Concurrency/Keywords.cc (modified) (11 diffs)

src/Concurrency/Keywords.cc

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 5
+// Update Count     : 10
 //
 
@@ -24 +24 @@
 #include "CodeGen/OperatorTable.h" // for isConstructor
 #include "InitTweak/InitTweak.h"   // for getPointerBase
-#include "Parser/LinkageSpec.h"    // for Cforall
+#include "SynTree/LinkageSpec.h"   // for Cforall
 #include "SynTree/Constant.h"      // for Constant
 #include "SynTree/Declaration.h"   // for StructDecl, FunctionDecl, ObjectDecl
@@ -53 +53 @@
           public:
 
-                ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main, KeywordCastExpr::Target cast_target ) :
+                ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main, AggregateDecl::Aggregate cast_target ) :
                   type_name( type_name ), field_name( field_name ), getter_name( getter_name ), context_error( context_error ), needs_main( needs_main ), cast_target( cast_target ) {}
 
@@ -59 +59 @@
 
                 Declaration * postmutate( StructDecl * decl );
+                DeclarationWithType * postmutate( FunctionDecl * decl );
 
                 void handle( StructDecl * );
@@ -75 +76 @@
                 const std::string context_error;
                 bool needs_main;
-                KeywordCastExpr::Target cast_target;
-
-                StructDecl* type_decl = nullptr;
+                AggregateDecl::Aggregate cast_target;
+
+                StructDecl   * type_decl = nullptr;
+                FunctionDecl * dtor_decl = nullptr;
         };
 
@@ -97 +99 @@
                         "__thrd",
                         "get_thread",
-                        "thread keyword requires threads to be in scope, add #include <thread.hfa>",
+                        "thread keyword requires threads to be in scope, add #include <thread.hfa>\n",
                         true,
-                        KeywordCastExpr::Thread
+                        AggregateDecl::Thread
                 )
                 {}
@@ -129 +131 @@
                         "__cor",
                         "get_coroutine",
-                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>\n",
                         true,
-                        KeywordCastExpr::Coroutine
+                        AggregateDecl::Coroutine
                 )
                 {}
@@ -161 +163 @@
                         "__mon",
                         "get_monitor",
-                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
+                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>\n",
                         false,
-                        KeywordCastExpr::Monitor
+                        AggregateDecl::Monitor
                 )
                 {}
@@ -284 +286 @@
         }
 
+        DeclarationWithType * ConcurrentSueKeyword::postmutate( FunctionDecl * decl ) {
+                if( !type_decl ) return decl;
+                if( !CodeGen::isDestructor( decl->name ) ) return decl;
+
+                auto params = decl->type->parameters;
+                if( params.size() != 1 ) return decl;
+
+                auto type = dynamic_cast<ReferenceType*>( params.front()->get_type() );
+                if( !type ) return decl;
+
+                auto stype = dynamic_cast<StructInstType*>( type->base );
+                if( !stype ) return decl;
+                if( stype->baseStruct != type_decl ) return decl;
+
+                if( !dtor_decl ) dtor_decl = decl;
+                return decl;
+        }
+
         Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
                 if ( cast_target == cast->target ) {
                         // convert (thread &)t to (thread_desc &)*get_thread(t), etc.
                         if( !type_decl ) SemanticError( cast, context_error );
-                        Expression * arg = cast->arg;
-                        cast->arg = nullptr;
-                        delete cast;
-                        return new CastExpr(
-                                UntypedExpr::createDeref(
-                                        new UntypedExpr( new NameExpr( getter_name ), { arg } )
-                                ),
-                                new ReferenceType(
-                                        noQualifiers,
-                                        new StructInstType( noQualifiers, type_decl ) )
-                                );
+                        if( !dtor_decl ) SemanticError( cast, context_error );
+                        assert( cast->result == nullptr );
+                        cast->set_result( new ReferenceType( noQualifiers, new StructInstType( noQualifiers, type_decl ) ) );
+                        cast->concrete_target.field  = field_name;
+                        cast->concrete_target.getter = getter_name;
                 }
                 return cast;
@@ -308 +322 @@
 
                 if( !type_decl ) SemanticError( decl, context_error );
+                if( !dtor_decl ) SemanticError( decl, context_error );
 
                 FunctionDecl * func = forwardDeclare( decl );
@@ -701 +716 @@
                                 new UntypedExpr(
                                         new NameExpr( "__thrd_start" ),
-                                        { new VariableExpr( param ) }
+                                        { new VariableExpr( param ), new NameExpr("main") }
                                 )
                         )