Ignore:
Timestamp:
Feb 8, 2017, 2:35:08 PM (8 years ago)
Author:
Aaron Moss <a3moss@…>
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:
e994912, f923b5f
Parents:
424931d (diff), 4fbdd1e3 (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:
src/tests/.expect/32
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r424931d rea23d10  
    1 __attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
     1__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
    22__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
    3 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
    4 __attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
    5 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
     3__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
     4__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
     5__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
    66extern int printf(const char *__restrict __format, ...);
    77volatile const short __x1__CVs_1;
    … …  
    629629}
    630630static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); }
    631 __attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
     631__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
    632632__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
    633 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
    634 __attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
    635 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
     633__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
     634__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
     635__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
    636636extern int printf(const char *__restrict __format, ...);
    637637static inline int invoke_main(int argc, char **argv, char **envp);

  • src/tests/.expect/32/extension.txt

    r424931d rea23d10  
    1 __attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
     1__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
    22__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
    3 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
    4 __attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
    5 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
     3__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
     4__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
     5__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
    66extern int printf(const char *__restrict __format, ...);
    77__extension__ int __a__i_1;
    … …  
    7777    __B__C2eE_1,
    7878};
     79__extension__ int __f__Fi___1();
     80__extension__ int i;
     81__extension__ int j;
    7982__extension__ int __fred__Fi_i__1(int __p__i_1){
    8083    int ___retval_fred__i_1;
    … …  
    8386        __extension__ int __b__i_2;
    8487        __extension__ int __c__i_2;
     88        __extension__ int *__x__Pi_2;
     89        __extension__ int *__y__Pi_2;
     90        __extension__ int *__z__Pi_2;
    8591    };
    8692    int __i__i_2 = ((int )(__extension__ __a__i_1+__extension__ 3));
    … …  
    94100    ((void)((_tmp_cp_ret0=__extension__ __fred__Fi_i__1(3)) , _tmp_cp_ret0));
    95101    ((void)((*((int *)(&_tmp_cp_ret0)))) /* ^?{} */);
     102    __extension__ int __mary__Fi_i__2(int __p__i_2){
     103        int ___retval_mary__i_2;
     104    }
    96105    ((void)__extension__ sizeof(3));
    97106    ((void)__extension__ (((int )(3!=((int )0))) || ((int )(4!=((int )0)))));

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

    r424931d rea23d10  
    1 __attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
     1__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
    22__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
    3 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
    4 __attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
    5 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
     3__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
     4__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
     5__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
    66extern int printf(const char *__restrict __format, ...);
    77extern int __x__i_1 asm ( "xx" );
    … …  
    166166}
    167167static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); }
    168 __attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
     168__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
    169169__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
    170 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
    171 __attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
    172 __attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
     170__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
     171__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
     172__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
    173173extern int printf(const char *__restrict __format, ...);
    174174static inline int invoke_main(int argc, char **argv, char **envp);
Note: See TracChangeset for help on using the changeset viewer.