Changeset 8d66610 for src/GenPoly

Timestamp:

May 21, 2021, 4:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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/GenPoly/Box.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -1525 +1525 @@
                                         stmtsToAddBefore.push_back( new DeclStmt( newBuf ) );
 
+                                        // if the object has a cleanup attribute, the cleanup should be on the buffer, not the pointer
+                                        auto matchAndMove = [newBuf](Attribute * attr){
+                                                if(attr->name == "cleanup") {
+                                                        newBuf->attributes.push_back(attr);
+                                                        return true;
+                                                }
+                                                return false;
+                                        };
+
+                                        objectDecl->attributes.remove_if(matchAndMove);
+
                                         delete objectDecl->get_init();
                                         objectDecl->set_init( new SingleInit( new VariableExpr( newBuf ) ) );