Changeset 0aaac0e for src/Concurrency/Waitfor.cc

Timestamp:

Oct 12, 2017, 3:15:32 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

b6b3c42, fb31cb8

Parents:

3364962 (diff), b10c621c (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/Waitfor.cc (modified) (8 diffs)

src/Concurrency/Waitfor.cc

@@ -190 +190 @@
 
                 Statement * makeAccStatement( DeclarationWithType * object, unsigned long index, const std::string & member, Expression * value, const SymTab::Indexer & indexer ) {
-                        std::unique_ptr< Expression > expr( makeOpAssign(
+                        Expression * expr = makeOpAssign(
                                 makeOpMember(
                                         makeOpIndex(
@@ -199 +199 @@
                                 ),
                                 value
-                        ) );
-
-                        return new ExprStmt( noLabels, ResolvExpr::findVoidExpression( expr.get(), indexer ) );
+                        );
+
+                        ResolvExpr::findVoidExpression( expr, indexer );
+
+                        return new ExprStmt( noLabels, expr );
                 }
 
@@ -313 +315 @@
                 stmt->push_back( new DeclStmt( noLabels, acceptables) );
 
-                UntypedExpr * set = new UntypedExpr(
+                Expression * set = new UntypedExpr(
                         new NameExpr( "__builtin_memset" ),
                         {
@@ -322 +324 @@
                 );
 
-                Expression * resolved_set = ResolvExpr::findVoidExpression( set, indexer );
-                delete set;
-
-                stmt->push_back( new ExprStmt( noLabels, resolved_set ) );
+                ResolvExpr::findVoidExpression( set, indexer );
+
+                stmt->push_back( new ExprStmt( noLabels, set ) );
 
                 return acceptables;
@@ -346 +347 @@
 
         Statement * GenerateWaitForPass::makeSetter( ObjectDecl * flag ) {
-                Expression * untyped = new UntypedExpr(
+                Expression * expr = new UntypedExpr(
                         new NameExpr( "?=?" ),
                         {
@@ -354 +355 @@
                 );
 
-                Expression * expr = ResolvExpr::findVoidExpression( untyped, indexer );
-                delete untyped;
+                ResolvExpr::findVoidExpression( expr, indexer );
 
                 return new ExprStmt( noLabels, expr );
@@ -379 +379 @@
                         new ListInit(
                                 map_range < std::list<Initializer*> > ( clause.target.arguments, [this](Expression * expr ){
-                                        Expression * untyped = new CastExpr(
+                                        Expression * init = new CastExpr(
                                                 new UntypedExpr(
                                                         new NameExpr( "get_monitor" ),
@@ -393 +393 @@
                                         );
 
-                                        Expression * init = ResolvExpr::findSingleExpression( untyped, indexer );
-                                        delete untyped;
+                                        ResolvExpr::findSingleExpression( init, indexer );
                                         return new SingleInit( init );
                                 })