Changeset 0e0f128c for tests/raii

Timestamp:

Aug 14, 2018, 1:20:59 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

7b3a6e6

Parents:

0c827019 (diff), 26f4dbe (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

Location:

tests/raii

Files:

• .expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR2.txt (modified) (1 diff)
• dtor-early-exit.c (modified) (1 diff)

tests/raii/.expect/dtor-early-exit-ERR1.txt

@@ -1 @@
-raii/dtor-early-exit.c:153:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
+raii/dtor-early-exit.c:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
   with target: L1
   with original target: L1

tests/raii/.expect/dtor-early-exit-ERR2.txt

@@ -1 @@
-raii/dtor-early-exit.c:217:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
+raii/dtor-early-exit.c:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
   with target: L2
   with original target: L2

tests/raii/dtor-early-exit.c

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 17 08:29:37 2016
-// Update Count     : 2
-//
-
-#include <fstream.hfa>
-#include <stdlib.hfa>
-extern "C" {
-#define false ((int)0)  // until stdbool.h works
-#define assert(cond) if (! (cond)) { sout | "Assertion failed: (" | #cond | ") at " __FILE__ | ":" | __LINE__ | endl; abort(); }
-}
+// Last Modified On : Sat Aug 11 07:58:39 2018
+// Update Count     : 8
+//
+
+#include <fstream>
+#include <stdlib>
+#include <assert.h>
 
 struct A {