Changeset f980549 for src/ControlStruct

Timestamp:

Sep 20, 2017, 12:24:45 PM (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:

b18830e

Parents:

764e009 (diff), 47b5b63 (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) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -622 +622 @@
                                 assertf(false, "Invalid throw in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
-                                        throwStmt->location.linenumber);
+                                        throwStmt->location.first_line);
                                 return nullptr;
                         }
@@ -633 +633 @@
                                 assertf(false, "Invalid throwResume in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
-                                        throwStmt->location.linenumber);
+                                        throwStmt->location.first_line);
                                 return nullptr;
                         }