Changeset 6c3a5ac1 for src/Concurrency

Timestamp:

Nov 26, 2019, 4:43:00 PM (5 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:

152c2b2

Parents:

d76bd79

Message:

Added better check to guarantee proper includes are present when using concurrency keywords

File:

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

src/Concurrency/Keywords.cc ¶

@@ -59 +59 @@
 
                 Declaration * postmutate( StructDecl * decl );
+                DeclarationWithType * postmutate( FunctionDecl * decl );
 
                 void handle( StructDecl * );
@@ -77 +78 @@
                 KeywordCastExpr::Target cast_target;
 
-                StructDecl* type_decl = nullptr;
+                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
@@ -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
@@ -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
@@ -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 );
+                        if( !dtor_decl ) SemanticError( cast, context_error );
                         Expression * arg = cast->arg;
                         cast->arg = nullptr;
@@ -308 +329 @@
 
                 if( !type_decl ) SemanticError( decl, context_error );
+                if( !dtor_decl ) SemanticError( decl, context_error );
 
                 FunctionDecl * func = forwardDeclare( decl );