Changeset 310e5b7 for src/Concurrency

Timestamp:

Sep 14, 2017, 4:26:54 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e149f77

Parents:

1dcd9554

Message:

Fix some issues with waitfor... it appears to work!

File:

• src/Concurrency/Waitfor.cc (modified) (3 diffs)

src/Concurrency/Waitfor.cc

@@ -204 +204 @@
                         return new ConstantExpr( Constant::from_bool( ifnull ) );
                 }
+
+                VariableExpr * extractVariable( Expression * func ) {
+                        if( VariableExpr * var = dynamic_cast< VariableExpr * >( func ) ) {
+                                return var;
+                        }
+
+                        CastExpr * cast = strict_dynamic_cast< CastExpr * >( func );
+                        return strict_dynamic_cast< VariableExpr * >( cast->arg );
+                }
+
+                Expression * betterIsDtor( Expression * func ) {
+                        VariableExpr * typed_func = extractVariable( func );
+                        bool is_dtor = InitTweak::isDestructor( typed_func->var );
+                        return new ConstantExpr( Constant::from_bool( is_dtor ) );
+                }
         };
 
@@ -212 +227 @@
 
         void GenerateWaitForPass::premutate( FunctionDecl * decl) {
-                if( decl->name != "__accept_internal" ) return;
+                if( decl->name != "__waitfor_internal" ) return;
 
                 decl_waitfor = decl;
@@ -313 +328 @@
                 Type * fptr_t = new PointerType( noQualifiers, new FunctionType( noQualifiers, true ) );
 
+                Expression * is_dtor = betterIsDtor( clause.target.function );
                 CompoundStmt * compound = new CompoundStmt( noLabels );
                 compound->push_back( makeAccStatement( acceptables, index, "func"    , new CastExpr( clause.target.function, fptr_t )                            , indexer ) );
                 compound->push_back( makeAccStatement( acceptables, index, "count"   , new ConstantExpr( Constant::from_ulong( clause.target.arguments.size() ) ), indexer ) );
                 compound->push_back( makeAccStatement( acceptables, index, "monitors", new VariableExpr( monitors )                                              , indexer ) );
-                compound->push_back( makeAccStatement( acceptables, index, "is_dtor" , new ConstantExpr( Constant::from_bool( true ) )                           , indexer ) );
+                compound->push_back( makeAccStatement( acceptables, index, "is_dtor" , is_dtor                                                                   , indexer ) );
 
                 stmt->push_back( new IfStmt(