Changeset d4f1521

Timestamp:

Nov 27, 2019, 5:04:19 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0f9ceacb

Parents:

30763fd (diff), 397c101a (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' into relaxed_ready

Files:

• libcfa/src/concurrency/kernel.hfa (modified) (1 diff)
• libcfa/src/concurrency/monitor.hfa (modified) (1 diff)
• src/Concurrency/Keywords.cc (modified) (7 diffs)
• src/ControlStruct/MLEMutator.cc (modified) (1 diff)
• tests/concurrent/.expect/keywordErrors.txt (added)
• tests/concurrent/keywordErrors.cfa (added)
• tests/raii/dtor-early-exit.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel.hfa

@@ -20 +20 @@
 #include "invoke.h"
 #include "time_t.hfa"
+#include "coroutine.hfa"
 
 extern "C" {

libcfa/src/concurrency/monitor.hfa

@@ -38 +38 @@
         dtor_node     = NULL;
 }
+
+static inline void ^?{}(monitor_desc & ) {}
 
 struct monitor_guard_t {

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 );

src/ControlStruct/MLEMutator.cc

@@ -231 +231 @@
 
         Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+                // only generate these when needed
+                if( !e.isContUsed() && !e.isBreakUsed() ) return bodyLoop;
+
                 // ensure loop body is a block
-                CompoundStmt *newBody;
-                if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
-                        newBody = new CompoundStmt();
-                        newBody->get_kids().push_back( bodyLoop );
-                } // if
-
-                // only generate these when needed
+                CompoundStmt * newBody = new CompoundStmt();
+                newBody->get_kids().push_back( bodyLoop );
 
                 if ( e.isContUsed() ) {

tests/raii/dtor-early-exit.cfa

@@ -217 +217 @@
 }
 
+void i() {
+        // potential loop
+        for() {
+                if(true) continue;
+                int t = 0;
+        }
+}
+
 // TODO: implement __label__ and uncomment these lines
 void computedGoto() {