Changeset a8367eb

Timestamp:

Sep 16, 2021, 2:21:12 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

4d8fbf4

Parents:

ce9f9d4

Message:

fixed mutexStmt bug related to pointers/references

Files:

• libcfa/src/concurrency/mutex_stmt.hfa (modified) (1 diff)
• src/Concurrency/Keywords.cc (modified) (3 diffs)

libcfa/src/concurrency/mutex_stmt.hfa

@@ -40 +40 @@
         }
     }
+
+    static inline L * __get_ptr( L & this ) {
+        return &this;
+    }
+
+    static inline L __get_type( L & this );
+
+    static inline L __get_type( L * this );
 }

src/Concurrency/Keywords.cc

@@ -1200 +1200 @@
                                 new PointerType(
                                         noQualifiers,
-                                        new TypeofType( noQualifiers, args.front()->clone() )
+                                        //new TypeofType( noQualifiers, args.front()->clone() )
+                                        new TypeofType( noQualifiers, new UntypedExpr(
+                                                        new NameExpr( "__get_type" ),
+                                                        { args.front()->clone() }
+                                                ) 
+                                        )
                                 ),
                                 new ConstantExpr( Constant::from_ulong( args.size() ) ),
@@ -1208 +1213 @@
                         new ListInit(
                                 map_range < std::list<Initializer*> > ( args, [](Expression * var ){
-                                        return new SingleInit( new AddressExpr( var ) );
+                                        return new SingleInit( new UntypedExpr(
+                                                        new NameExpr( "__get_ptr" ),
+                                                        { var }
+                                        ) );
+                                        //return new SingleInit( new AddressExpr( var ) );
                                 })
                         )
@@ -1214 +1223 @@
 
                 StructInstType * lock_guard_struct = new StructInstType( noQualifiers, lock_guard_decl );
-                TypeExpr * lock_type_expr = new TypeExpr( new TypeofType( noQualifiers, args.front()->clone() ) );
+                TypeExpr * lock_type_expr = new TypeExpr( 
+                        new TypeofType( noQualifiers, new UntypedExpr(
+                                new NameExpr( "__get_type" ),
+                                { args.front()->clone() }
+                                ) 
+                        ) 
+                );
 
                 lock_guard_struct->parameters.push_back( lock_type_expr ) ;