Changeset 7a5d773 for src/tests

Timestamp:

Aug 18, 2016, 10:08:51 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7ecbb7e

Parents:

6643e72 (diff), 3b8e52c (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/tests/.expect/32/gccExtensions.txt (modified) (3 diffs)

src/tests/.expect/32/gccExtensions.txt

@@ -11 +11 @@
     asm ( "nop" :  :  :  );
     static int __y__i_2;
+    static int *__z__Pi_2;
     int __src__i_2;
     int __dst__i_2;
@@ -23 +24 @@
     const int __i2__Ci_2;
     const int __i3__Ci_2;
+    inline int __f1__Fi___2(){
+    }
+    inline int __f2__Fi___2(){
+    }
+    int __s1__i_2;
+    int __s2__i_2;
+    volatile int __v1__Vi_2;
+    volatile int __v2__Vi_2;
+    int __t1___2;
+    int __t2___2;
     __extension__ const int __ex__Ci_2;
     struct S {
@@ -73 +84 @@
     ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2)));
     ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2)));
-    inline int __f1__Fi___2(){
-    }
-    inline int __f2__Fi___2(){
-    }
-    int __s1__i_2;
-    int __s2__i_2;
-    int __t1___2;
-    int __t2___2;
-    volatile int __v1__Vi_2;
-    volatile int __v2__Vi_2;
     int __a1__i_2;
     const int __a2__Ci_2;