Changeset 0db48ca for src/ResolvExpr

Timestamp:

Feb 12, 2022, 1:56:44 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

0ebbca4

Parents:

4708eaa (diff), eb211bf (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• Resolver.cc (modified) (4 diffs)
• Resolver.h (modified) (2 diffs)

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;

src/ResolvExpr/Resolver.h

@@ -35 +35 @@
         class StmtExpr;
         class SymbolTable;
-        struct TranslationUnit;
+        class TranslationUnit;
         class Type;
         class TypeEnvironment;
@@ -72 +72 @@
         ast::ptr< ast::Init > resolveCtorInit(
                 const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab );
-        /// Resolves a statement expression 
+        /// Resolves a statement expression
         const ast::Expr * resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab );