Changeset e7ce55e

Timestamp:

Jun 27, 2016, 4:17:30 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

21610e3, 466149d

Parents:

7bd045d (diff), c1c09285 (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

Location:

src

Files:

• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)

src/SymTab/Validate.cc

@@ -483 +483 @@
 
         void ReturnChecker::visit( ReturnStmt * returnStmt ) {
+                // Previously this also checked for the existence of an expr paired with no return values on
+                // the  function return type. This is incorrect, since you can have an expression attached to
+                // a return statement in a void-returning function in C. The expression is treated as if it
+                // were cast to void.
                 if ( returnStmt->get_expr() == NULL && returnVals.size() != 0 ) {
                         throw SemanticError( "Non-void function returns no values: " , returnStmt );
-                } else if ( returnStmt->get_expr() != NULL && returnVals.size() == 0 ) {
-                        throw SemanticError( "void function returns values: " , returnStmt );
                 }
         }

src/SynTree/Statement.cc

@@ -399 +399 @@
 }
 
-ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( other.callStmt ) {
+ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( maybeClone( other.callStmt ) ) {
 }
 
 ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
+        delete callStmt;
 }