Changeset f73f5f4 for src/ControlStruct

Timestamp:

Jul 12, 2017, 10:14:15 AM (8 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:

3268a58, 76f2bdcb

Parents:

f2b12406 (diff), 7812f1d1 (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/ControlStruct/ExceptTranslate.cc (modified) (4 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 30 13:30:00 2017
-// Update Count     : 1
+// Last Modified On : Tus Jul 11 16:33:00 2017
+// Update Count     : 2
 //
 
@@ -157 +157 @@
         Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
                 // { int NAME = EXPR; __throw_terminate( &NAME ); }
-                return create_given_throw( "__cfaehm__throw_termination", throwStmt );
+                return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
         }
         Statement * create_terminate_rethrow( ThrowStmt *throwStmt ) {
@@ -164 +164 @@
                 Statement * result = new ExprStmt(
                         throwStmt->get_labels(),
-                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_termination" ) )
+                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
                         );
                 delete throwStmt;
@@ -171 +171 @@
         Statement * create_resume_throw( ThrowStmt *throwStmt ) {
                 // __throw_resume( EXPR );
-                return create_given_throw( "__cfaehm__throw_resumption", throwStmt );
+                return create_given_throw( "__cfaehm__throw_resume", throwStmt );
         }
         Statement * create_resume_rethrow( ThrowStmt *throwStmt ) {