Changeset 579263a for src/tests/.expect/32/declarationSpecifier.txt

Timestamp:

Jun 26, 2017, 4:48:35 PM (8 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:

bb1cd95

Parents:

e4d829b (diff), 2a7b3ca (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' into designations

Conflicts:

src/InitTweak/FixInit.cc
src/SymTab/Autogen.h
src/SynTree/Initializer.cc
src/SynTree/Initializer.h
src/Tuples/TupleExpansion.cc

File:

• src/tests/.expect/32/declarationSpecifier.txt (modified) (2 diffs)

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

@@ -670 +670 @@
 static inline volatile const short __f48__FCVs___1();
 int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){
-    int ___retval_main__i_1;
+    __attribute__ ((unused)) int ___retval_main__i_1;
     ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
@@ -685 +685 @@
 static inline int invoke_main(int argc, char **argv, char **envp);
 int main(int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){
-    int ___retval_main__i_1;
+    __attribute__ ((unused)) int ___retval_main__i_1;
     int _tmp_cp_ret0;
     ((void)(___retval_main__i_1=((_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1)) , _tmp_cp_ret0)) /* ?{} */);