Changeset 8f98b78 for src/Concurrency

Timestamp:

Sep 19, 2017, 3:55: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:

764e009

Parents:

695e00d

Message:

Now properly resolve the calls to get_monitor

File:

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

src/Concurrency/Waitfor.cc

@@ -214 +214 @@
                 }
 
-                Expression * betterIsDtor( Expression * func ) {
+                Expression * detectIsDtor( Expression * func ) {
                         VariableExpr * typed_func = extractVariable( func );
                         bool is_dtor = InitTweak::isDestructor( typed_func->var );
@@ -302 +302 @@
                         new ArrayType(
                                 noQualifiers,
-                                new StructInstType(
+                                new PointerType(
                                         noQualifiers,
-                                        decl_monitor
+                                        new StructInstType(
+                                                noQualifiers,
+                                                decl_monitor
+                                        )
                                 ),
                                 new ConstantExpr( Constant::from_ulong( clause.target.arguments.size() ) ),
@@ -312 +315 @@
                         new ListInit(
                                 map_range < std::list<Initializer*> > ( clause.target.arguments, [this](Expression * expr ){
-                                        return new SingleInit( expr );
+                                        Expression * untyped = new CastExpr(
+                                                new UntypedExpr(
+                                                        new NameExpr( "get_monitor" ),
+                                                        { expr }
+                                                ),
+                                                new PointerType(
+                                                        noQualifiers,
+                                                        new StructInstType(
+                                                                noQualifiers,
+                                                                decl_monitor
+                                                        )
+                                                )
+                                        );
+
+                                        Expression * init = ResolvExpr::findSingleExpression( untyped, indexer );
+                                        delete untyped;
+                                        return new SingleInit( init );
                                 })
                         )
@@ -328 +347 @@
                 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, "is_dtor" , detectIsDtor( clause.target.function )                                    , indexer ) );
                 compound->push_back( makeAccStatement( acceptables, index, "func"    , new CastExpr( clause.target.function, fptr_t )                            , indexer ) );
+                compound->push_back( makeAccStatement( acceptables, index, "monitors", new VariableExpr( monitors )                                              , 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" , is_dtor                                                                   , indexer ) );
 
                 stmt->push_back( new IfStmt(