Changeset 981bdc6 for src/tests/.expect/32/declarationSpecifier.txt

Timestamp:

Jan 12, 2017, 2:05:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f3b0a07

Parents:

2298a7b8 (diff), 3fe34ae (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:/u/cforall/software/cfa/cfa-cc

File:

• src/tests/.expect/32/declarationSpecifier.txt (modified) (1 diff)

src/tests/.expect/32/declarationSpecifier.txt

@@ -621 +621 @@
 static inline volatile const short __f47__FCVs___1();
 static inline volatile const short __f48__FCVs___1();
-int main(int __argc__i_1, const char **__argv__PPCc_1){
+int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){
     int ___retval_main__i_1;
     ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
-}
+    ((void)(___retval_main__i_1=0) /* ?{} */);
+    return ((int )___retval_main__i_1);
+}
+int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); }
+