Changeset fb57626 for src/Concurrency

Timestamp:

Dec 18, 2017, 2:27:58 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

46dfe66

Parents:

b8b075cd (diff), 06088f9a (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Concurrency/Keywords.cc (modified) (5 diffs)

src/Concurrency/Keywords.cc

@@ -257 +257 @@
         // Generic keyword implementation
         //=============================================================================================
+        void fixupGenerics(FunctionType * func, StructDecl * decl) {
+                cloneAll(decl->parameters, func->forall);
+                for ( TypeDecl * td : func->forall ) {
+                        strict_dynamic_cast<StructInstType*>(
+                                func->parameters.front()->get_type()->stripReferences()
+                        )->parameters.push_back(
+                                new TypeExpr( new TypeInstType( noQualifiers, td->name, td ) )
+                        );
+                }
+        }
+
         void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
                 if( decl->name == type_name && decl->body ) {
@@ -301 +312 @@
                 );
 
-                get_type->get_parameters().push_back( this_decl );
+                get_type->get_parameters().push_back( this_decl->clone() );
                 get_type->get_returnVals().push_back(
                         new ObjectDecl(
@@ -318 +329 @@
                         )
                 );
+                fixupGenerics(get_type, decl);
 
                 FunctionDecl * get_decl = new FunctionDecl(
@@ -343 +355 @@
                                 nullptr
                         );
-                }
+                        fixupGenerics(main_type, decl);
+                }
+
+                delete this_decl;
 
                 declsToAddBefore.push_back( forward );
@@ -377 +392 @@
                                         new MemberExpr(
                                                 field,
-                                                UntypedExpr::createDeref( new VariableExpr( func->get_functionType()->get_parameters().front() ) )
+                                                new CastExpr(
+                                                        new VariableExpr( func->get_functionType()->get_parameters().front() ),
+                                                        func->get_functionType()->get_parameters().front()->get_type()->stripReferences()->clone()
+                                                )
                                         )
                                 )