Ignore:
Timestamp:
Jul 5, 2017, 4:47:00 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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:
0614d14, 208e5be, a5de33e, ff919a3
Parents:
8c97ee7 (diff), b72d4ed (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.
git-author:
Thierry Delisle <tdelisle@…> (07/05/17 16:43:21)
git-committer:
Thierry Delisle <tdelisle@…> (07/05/17 16:47:00)
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ControlStruct/ExceptTranslate.cc

    r8c97ee7 r1ce2189  
    354354                        }
    355355                        handling_code->push_back( new ReturnStmt( noLabels,
    356                                 new ConstantExpr( Constant::from_bool( false ) ) ) );
     356                                new ConstantExpr( Constant::from_bool( true ) ) ) );
    357357                        handler->set_body( handling_code );
    358358
     
    361361                        *it = nullptr;
    362362                }
     363
     364                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
     365                        Constant::from_bool( false ) ) ) );
    363366
    364367                return new FunctionDecl("handle", Type::StorageClasses(),
Note: See TracChangeset for help on using the changeset viewer.