Changeset b067d9b for src/ControlStruct/ExceptTranslate.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Wed Jun 14 16:49:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 17:19:00 2017
-// Update Count     : 9
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb 13 18:15:29 2019
+// Update Count     : 11
 //
 
@@ -319 +319 @@
                         }
 
-                        block->push_back( handler->get_body() );
-                        handler->set_body( nullptr );
+                        block->push_back( handler->body );
+                        handler->body = nullptr;
 
                         std::list<Statement *> caseBody
@@ -617 +617 @@
                                 return create_terminate_rethrow( throwStmt );
                         } else {
-                                assertf(false, "Invalid throw in %s at %i\n",
+                                abort("Invalid throw in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
                                         throwStmt->location.first_line);
-                                return nullptr;
                         }
                 } else {
@@ -628 +627 @@
                                 return create_resume_rethrow( throwStmt );
                         } else {
-                                assertf(false, "Invalid throwResume in %s at %i\n",
+                                abort("Invalid throwResume in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
                                         throwStmt->location.first_line);
-                                return nullptr;
                         }
                 }