Changeset d672350 for src/Concurrency/Keywords.cc

Timestamp:

Mar 21, 2022, 1:44:06 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a76202d

Parents:

ef3c383 (diff), dbe2533 (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

File:

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

src/Concurrency/Keywords.cc

@@ -422 +422 @@
                         ;
                 else if ( auto param = isMainFor( decl, cast_target ) ) {
-                        // This should never trigger.
-                        assert( vtable_decl );
+                        if ( !vtable_decl ) {
+                                SemanticError( decl, context_error );
+                        }
                         // Should be safe because of isMainFor.
                         StructInstType * struct_type = static_cast<StructInstType *>(
@@ -1203 +1204 @@
                                         //new TypeofType( noQualifiers, args.front()->clone() )
                                         new TypeofType( noQualifiers, new UntypedExpr(
-                                                        new NameExpr( "__get_type" ),
+                                                        new NameExpr( "__get_mutexstmt_lock_type" ),
                                                         { args.front()->clone() }
                                                 ) 
@@ -1215 +1216 @@
                                 map_range < std::list<Initializer*> > ( args, [](Expression * var ){
                                         return new SingleInit( new UntypedExpr(
-                                                        new NameExpr( "__get_ptr" ),
+                                                        new NameExpr( "__get_mutexstmt_lock_ptr" ),
                                                         { var }
                                         ) );
@@ -1226 +1227 @@
                 TypeExpr * lock_type_expr = new TypeExpr( 
                         new TypeofType( noQualifiers, new UntypedExpr(
-                                new NameExpr( "__get_type" ),
+                                new NameExpr( "__get_mutexstmt_lock_type" ),
                                 { args.front()->clone() }
                                 )