Changeset fd35f76

Timestamp:

Apr 21, 2020, 5:44:58 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

192ac5d, 7fd71c7

Parents:

a3fab47 (diff), 62cc231 (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

Files:

• benchmark/io/readv.cfa (added)
• libcfa/src/exception.c (modified) (2 diffs)
• tests/test.py (modified) (1 diff)

libcfa/src/exception.c

@@ -445 +445 @@
 
 #pragma GCC push_options
-#if __GNUC__ < 7
-#pragma GCC optimize("no-toplevel-reorder")
-#elif __GNUC__ == 7
 #pragma GCC optimize(0)
-#endif
 
 // Try statements are hoisted out see comments for details. While this could probably be unique
@@ -546 +542 @@
         "       .quad __gcfa_personality_v0\n"
 #else // then __i386
-        "   .long __gcfa_personality_v0\n"
+        "       .long __gcfa_personality_v0\n"
 #endif
 );

tests/test.py

@@ -206 +206 @@
 
                 else:
-                        with open (out_file, "r") as myfile:
-                                error = myfile.read()
+                        if os.stat(out_file).st_size < 1048576:
+                                with open (out_file, "r") as myfile:
+                                        error = myfile.read()
+                        else:
+                                error = "Output log can't be read, file is bigger than 1MB, see {} for actual error\n".format(out_file)
 
                         ret, info = core_info(exe_file)