Changeset e7ce55e


Ignore:
Timestamp:
Jun 27, 2016, 4:17:30 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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), c1c0928 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Validate.cc

    r7bd045d re7ce55e  
    483483
    484484        void ReturnChecker::visit( ReturnStmt * returnStmt ) {
     485                // Previously this also checked for the existence of an expr paired with no return values on
     486                // the  function return type. This is incorrect, since you can have an expression attached to
     487                // a return statement in a void-returning function in C. The expression is treated as if it
     488                // were cast to void.
    485489                if ( returnStmt->get_expr() == NULL && returnVals.size() != 0 ) {
    486490                        throw SemanticError( "Non-void function returns no values: " , returnStmt );
    487                 } else if ( returnStmt->get_expr() != NULL && returnVals.size() == 0 ) {
    488                         throw SemanticError( "void function returns values: " , returnStmt );
    489491                }
    490492        }
  • src/SynTree/Statement.cc

    r7bd045d re7ce55e  
    399399}
    400400
    401 ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( other.callStmt ) {
     401ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( maybeClone( other.callStmt ) ) {
    402402}
    403403
    404404ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
     405        delete callStmt;
    405406}
    406407
Note: See TracChangeset for help on using the changeset viewer.