Changeset 6668a3e

Timestamp:

Feb 11, 2022, 12:17:39 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

08e4e6a

Parents:

1f7dc61

Message:

Waitfor now resolves calls to get_monitor inside the resolver rather than after.

Location:

src

Files:

• Concurrency/Waitfor.cc (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (4 diffs)

src/Concurrency/Waitfor.cc

@@ -373 +373 @@
                         new ListInit(
                                 map_range < std::list<Initializer*> > ( clause.target.arguments, [this](Expression * expr ){
-                                        Expression * init = new CastExpr(
-                                                new UntypedExpr(
-                                                        new NameExpr( "get_monitor" ),
-                                                        { expr }
-                                                ),
-                                                new PointerType(
-                                                        noQualifiers,
-                                                        new StructInstType(
-                                                                noQualifiers,
-                                                                decl_monitor
-                                                        )
-                                                ),
-                                                false
-                                        );
-
-                                        ResolvExpr::findSingleExpression( init, indexer );
-                                        return new SingleInit( init );
+                                        return new SingleInit( expr );
                                 })
                         )

src/ResolvExpr/Resolver.cc

@@ -1112 +1112 @@
                 }
 
-                
+
         } // anonymous namespace
 /// Establish post-resolver invariants for expressions
@@ -1158 +1158 @@
 
         namespace {
-                
+
 
                 /// resolve `untyped` to the expression whose candidate satisfies `pred` with the
@@ -1905 +1905 @@
 
                         clause2.target.args.reserve( clause.target.args.size() );
+                        const ast::StructDecl * decl_monitor = symtab.lookupStruct( "monitor$" );
                         for ( auto arg : argsCandidates.front() ) {
-                                clause2.target.args.emplace_back( std::move( arg->expr ) );
+                                const auto & loc = stmt->location;
+
+                                ast::Expr * init = new ast::CastExpr( loc,
+                                        new ast::UntypedExpr( loc,
+                                                new ast::NameExpr( loc, "get_monitor" ),
+                                                { arg->expr }
+                                        ),
+                                        new ast::PointerType(
+                                                new ast::StructInstType(
+                                                        decl_monitor
+                                                )
+                                        )
+                                );
+
+                                clause2.target.args.emplace_back( findSingleExpression( init, symtab ) );
                         }
 
@@ -2077 +2092 @@
                 if (auto functionDecl = decl.as<ast::FunctionDecl>()) {
                         // xxx - can intrinsic gen ever fail?
-                        if (functionDecl->linkage == ast::Linkage::AutoGen) { 
+                        if (functionDecl->linkage == ast::Linkage::AutoGen) {
                                 auto mutDecl = mutate(functionDecl);
                                 mutDecl->isDeleted = true;