Changeset b038fe4 for src/ControlStruct

Timestamp:

May 9, 2019, 4:48:12 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

292d599b

Parents:

63364d8 (diff), 02af79b0 (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' into ctxswitch

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -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;
                         }
                 }