Index: src/Common/Debug.h =================================================================== --- src/Common/Debug.h (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/Common/Debug.h (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -24,15 +24,34 @@ #include "SynTree/Declaration.h" -/// debug codegen a translation unit -static inline void debugCodeGen( const std::list< Declaration * > & translationUnit, const std::string & label ) { - std::list< Declaration * > decls; +#define DEBUG - filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) { - return ! LinkageSpec::isBuiltin( decl->get_linkage() ); - }); +namespace Debug { + /// debug codegen a translation unit + static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) { + #ifdef DEBUG + std::list< Declaration * > decls; - std::cerr << "======" << label << "======" << std::endl; - CodeGen::generate( decls, std::cerr, false, true ); -} // dump + filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) { + return ! LinkageSpec::isBuiltin( decl->get_linkage() ); + }); + + std::cerr << "======" << label << "======" << std::endl; + CodeGen::generate( decls, std::cerr, false, true ); + #endif + } // dump + + static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) { + #ifdef DEBUG + std::list< Declaration * > decls; + + filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) { + return ! LinkageSpec::isBuiltin( decl->get_linkage() ); + }); + + std::cerr << "======" << label << "======" << std::endl; + printAll( decls, std::cerr ); + #endif + } // dump +} // Local Variables: // Index: src/ResolvExpr/RenameVars.cc =================================================================== --- src/ResolvExpr/RenameVars.cc (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/ResolvExpr/RenameVars.cc (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -29,5 +29,5 @@ RenameVars global_renamer; - RenameVars::RenameVars() : level( 0 ) { + RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) { mapStack.push_front( std::map< std::string, std::string >() ); } @@ -35,4 +35,5 @@ void RenameVars::reset() { level = 0; + resetCount++; } @@ -130,5 +131,5 @@ for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) { std::ostringstream output; - output << "_" << level << "_" << (*i)->get_name(); + output << "_" << resetCount << "_" << level << "_" << (*i)->get_name(); std::string newname( output.str() ); mapStack.front()[ (*i)->get_name() ] = newname; Index: src/ResolvExpr/RenameVars.h =================================================================== --- src/ResolvExpr/RenameVars.h (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/ResolvExpr/RenameVars.h (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -48,5 +48,5 @@ void typeBefore( Type *type ); void typeAfter( Type *type ); - int level; + int level, resetCount; std::list< std::map< std::string, std::string > > mapStack; }; Index: src/main.cc =================================================================== --- src/main.cc (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/main.cc (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -206,5 +206,5 @@ FILE * extras = fopen( libcfap | treep ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" ); assertf( extras, "cannot open extras.cf\n" ); - parse( extras, LinkageSpec::C ); + parse( extras, LinkageSpec::BuiltinC ); if ( ! libcfap ) { Index: src/tests/.expect/32/KRfunctions.txt =================================================================== --- src/tests/.expect/32/KRfunctions.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/32/KRfunctions.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); signed int __f0__Fi_iPCii__1(signed int __a__i_1, const signed int *__b__PCi_1, signed int __c__i_1){ __attribute__ ((unused)) signed int ___retval_f0__i_1; Index: src/tests/.expect/32/attributes.txt =================================================================== --- src/tests/.expect/32/attributes.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/32/attributes.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); signed int __la__Fi___1(){ __attribute__ ((unused)) signed int ___retval_la__i_1; Index: src/tests/.expect/32/declarationSpecifier.txt =================================================================== --- src/tests/.expect/32/declarationSpecifier.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/32/declarationSpecifier.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); volatile const signed short int __x1__CVs_1; static volatile const signed short int __x2__CVs_1; @@ -701,10 +695,4 @@ } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); static inline signed int invoke_main(signed int argc, char **argv, char **envp); signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ Index: src/tests/.expect/32/extension.txt =================================================================== --- src/tests/.expect/32/extension.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/32/extension.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); __extension__ signed int __a__i_1; __extension__ signed int __b__i_1; Index: src/tests/.expect/32/gccExtensions.txt =================================================================== --- src/tests/.expect/32/gccExtensions.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/32/gccExtensions.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); extern signed int __x__i_1 asm ( "xx" ); signed int __main__Fi_iPPCc__1(signed int __argc__i_1, const char **__argv__PPCc_1){ @@ -174,10 +168,4 @@ } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); static inline signed int invoke_main(signed int argc, char **argv, char **envp); signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ Index: src/tests/.expect/32/literals.txt =================================================================== --- src/tests/.expect/32/literals.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/32/literals.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); void __for_each__A0_2_0_0____operator_assign__PFd0_Rd0d0____constructor__PF_Rd0____constructor__PF_Rd0d0____destructor__PF_Rd0____operator_assign__PFd1_Rd1d1____constructor__PF_Rd1____constructor__PF_Rd1d1____destructor__PF_Rd1____operator_preincr__PFd0_Rd0____operator_predecr__PFd0_Rd0____operator_equal__PFi_d0d0____operator_notequal__PFi_d0d0____operator_deref__PFRd1_d0__F_d0d0PF_d1___1(__attribute__ ((unused)) void (*_adapterF_9telt_type__P)(void (*__anonymous_object0)(), void *__anonymous_object1), __attribute__ ((unused)) void *(*_adapterFP9telt_type_14titerator_type_M_P)(void (*__anonymous_object2)(), void *__anonymous_object3), __attribute__ ((unused)) signed int (*_adapterFi_14titerator_type14titerator_type_M_PP)(void (*__anonymous_object4)(), void *__anonymous_object5, void *__anonymous_object6), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type_P_M)(void (*__anonymous_object7)(), __attribute__ ((unused)) void *___retval__operator_preincr__14titerator_type_1, void *__anonymous_object8), __attribute__ ((unused)) void (*_adapterF_P9telt_type9telt_type__MP)(void (*__anonymous_object9)(), void *__anonymous_object10, void *__anonymous_object11), __attribute__ ((unused)) void (*_adapterF9telt_type_P9telt_type9telt_type_P_MP)(void (*__anonymous_object12)(), __attribute__ ((unused)) void *___retval__operator_assign__9telt_type_1, void *__anonymous_object13, void *__anonymous_object14), __attribute__ ((unused)) void (*_adapterF_P14titerator_type14titerator_type__MP)(void (*__anonymous_object15)(), void *__anonymous_object16, void *__anonymous_object17), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type14titerator_type_P_MP)(void (*__anonymous_object18)(), __attribute__ ((unused)) void *___retval__operator_assign__14titerator_type_1, void *__anonymous_object19, void *__anonymous_object20), __attribute__ ((unused)) unsigned long int _sizeof_14titerator_type, __attribute__ ((unused)) unsigned long int _alignof_14titerator_type, __attribute__ ((unused)) unsigned long int _sizeof_9telt_type, __attribute__ ((unused)) unsigned long int _alignof_9telt_type, __attribute__ ((unused)) void *(*___operator_assign__PF14titerator_type_R14titerator_type14titerator_type__1)(void *__anonymous_object21, void *__anonymous_object22), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type__1)(void *__anonymous_object23), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type14titerator_type__1)(void *__anonymous_object24, void *__anonymous_object25), __attribute__ ((unused)) void (*___destructor__PF_R14titerator_type__1)(void *__anonymous_object26), __attribute__ ((unused)) void *(*___operator_assign__PF9telt_type_R9telt_type9telt_type__1)(void *__anonymous_object27, void *__anonymous_object28), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type__1)(void *__anonymous_object29), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type9telt_type__1)(void *__anonymous_object30, void *__anonymous_object31), __attribute__ ((unused)) void (*___destructor__PF_R9telt_type__1)(void *__anonymous_object32), __attribute__ ((unused)) void *(*___operator_preincr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object33), __attribute__ ((unused)) void *(*___operator_predecr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object34), __attribute__ ((unused)) signed int (*___operator_equal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object35, void *__anonymous_object36), __attribute__ ((unused)) signed int (*___operator_notequal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object37, void *__anonymous_object38), __attribute__ ((unused)) void *(*___operator_deref__PFR9telt_type_14titerator_type__1)(void *__anonymous_object39), void *__begin__14titerator_type_1, void *__end__14titerator_type_1, void (*__func__PF_9telt_type__1)(void *__anonymous_object40)); void __for_each_reverse__A0_2_0_0____operator_assign__PFd0_Rd0d0____constructor__PF_Rd0____constructor__PF_Rd0d0____destructor__PF_Rd0____operator_assign__PFd1_Rd1d1____constructor__PF_Rd1____constructor__PF_Rd1d1____destructor__PF_Rd1____operator_preincr__PFd0_Rd0____operator_predecr__PFd0_Rd0____operator_equal__PFi_d0d0____operator_notequal__PFi_d0d0____operator_deref__PFRd1_d0__F_d0d0PF_d1___1(__attribute__ ((unused)) void (*_adapterF_9telt_type__P)(void (*__anonymous_object41)(), void *__anonymous_object42), __attribute__ ((unused)) void *(*_adapterFP9telt_type_14titerator_type_M_P)(void (*__anonymous_object43)(), void *__anonymous_object44), __attribute__ ((unused)) signed int (*_adapterFi_14titerator_type14titerator_type_M_PP)(void (*__anonymous_object45)(), void *__anonymous_object46, void *__anonymous_object47), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type_P_M)(void (*__anonymous_object48)(), __attribute__ ((unused)) void *___retval__operator_preincr__14titerator_type_1, void *__anonymous_object49), __attribute__ ((unused)) void (*_adapterF_P9telt_type9telt_type__MP)(void (*__anonymous_object50)(), void *__anonymous_object51, void *__anonymous_object52), __attribute__ ((unused)) void (*_adapterF9telt_type_P9telt_type9telt_type_P_MP)(void (*__anonymous_object53)(), __attribute__ ((unused)) void *___retval__operator_assign__9telt_type_1, void *__anonymous_object54, void *__anonymous_object55), __attribute__ ((unused)) void (*_adapterF_P14titerator_type14titerator_type__MP)(void (*__anonymous_object56)(), void *__anonymous_object57, void *__anonymous_object58), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type14titerator_type_P_MP)(void (*__anonymous_object59)(), __attribute__ ((unused)) void *___retval__operator_assign__14titerator_type_1, void *__anonymous_object60, void *__anonymous_object61), __attribute__ ((unused)) unsigned long int _sizeof_14titerator_type, __attribute__ ((unused)) unsigned long int _alignof_14titerator_type, __attribute__ ((unused)) unsigned long int _sizeof_9telt_type, __attribute__ ((unused)) unsigned long int _alignof_9telt_type, __attribute__ ((unused)) void *(*___operator_assign__PF14titerator_type_R14titerator_type14titerator_type__1)(void *__anonymous_object62, void *__anonymous_object63), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type__1)(void *__anonymous_object64), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type14titerator_type__1)(void *__anonymous_object65, void *__anonymous_object66), __attribute__ ((unused)) void (*___destructor__PF_R14titerator_type__1)(void *__anonymous_object67), __attribute__ ((unused)) void *(*___operator_assign__PF9telt_type_R9telt_type9telt_type__1)(void *__anonymous_object68, void *__anonymous_object69), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type__1)(void *__anonymous_object70), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type9telt_type__1)(void *__anonymous_object71, void *__anonymous_object72), __attribute__ ((unused)) void (*___destructor__PF_R9telt_type__1)(void *__anonymous_object73), __attribute__ ((unused)) void *(*___operator_preincr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object74), __attribute__ ((unused)) void *(*___operator_predecr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object75), __attribute__ ((unused)) signed int (*___operator_equal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object76, void *__anonymous_object77), __attribute__ ((unused)) signed int (*___operator_notequal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object78, void *__anonymous_object79), __attribute__ ((unused)) void *(*___operator_deref__PFR9telt_type_14titerator_type__1)(void *__anonymous_object80), void *__begin__14titerator_type_1, void *__end__14titerator_type_1, void (*__func__PF_9telt_type__1)(void *__anonymous_object81)); @@ -1377,10 +1371,4 @@ } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi___1(); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); static inline signed int invoke_main(signed int argc, char **argv, char **envp); signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ Index: src/tests/.expect/64/KRfunctions.txt =================================================================== --- src/tests/.expect/64/KRfunctions.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/64/KRfunctions.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); signed int __f0__Fi_iPCii__1(signed int __a__i_1, const signed int *__b__PCi_1, signed int __c__i_1){ __attribute__ ((unused)) signed int ___retval_f0__i_1; Index: src/tests/.expect/64/attributes.txt =================================================================== --- src/tests/.expect/64/attributes.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/64/attributes.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); signed int __la__Fi___1(){ __attribute__ ((unused)) signed int ___retval_la__i_1; Index: src/tests/.expect/64/declarationSpecifier.txt =================================================================== --- src/tests/.expect/64/declarationSpecifier.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/64/declarationSpecifier.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); volatile const signed short int __x1__CVs_1; static volatile const signed short int __x2__CVs_1; @@ -701,10 +695,4 @@ } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); static inline signed int invoke_main(signed int argc, char **argv, char **envp); signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ Index: src/tests/.expect/64/extension.txt =================================================================== --- src/tests/.expect/64/extension.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/64/extension.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); __extension__ signed int __a__i_1; __extension__ signed int __b__i_1; Index: src/tests/.expect/64/gccExtensions.txt =================================================================== --- src/tests/.expect/64/gccExtensions.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/64/gccExtensions.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); extern signed int __x__i_1 asm ( "xx" ); signed int __main__Fi_iPPCc__1(signed int __argc__i_1, const char **__argv__PPCc_1){ @@ -174,10 +168,4 @@ } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); static inline signed int invoke_main(signed int argc, char **argv, char **envp); signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ Index: src/tests/.expect/64/literals.txt =================================================================== --- src/tests/.expect/64/literals.txt (revision a5b7905d626e51a2c959ddc46ed61c06d1e970c7) +++ src/tests/.expect/64/literals.txt (revision 366cf9b1e5ffaa2e3009bacadfeb0e66a8656c85) @@ -1,8 +1,2 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); void __for_each__A0_2_0_0____operator_assign__PFd0_Rd0d0____constructor__PF_Rd0____constructor__PF_Rd0d0____destructor__PF_Rd0____operator_assign__PFd1_Rd1d1____constructor__PF_Rd1____constructor__PF_Rd1d1____destructor__PF_Rd1____operator_preincr__PFd0_Rd0____operator_predecr__PFd0_Rd0____operator_equal__PFi_d0d0____operator_notequal__PFi_d0d0____operator_deref__PFRd1_d0__F_d0d0PF_d1___1(__attribute__ ((unused)) void (*_adapterF_9telt_type__P)(void (*__anonymous_object0)(), void *__anonymous_object1), __attribute__ ((unused)) void *(*_adapterFP9telt_type_14titerator_type_M_P)(void (*__anonymous_object2)(), void *__anonymous_object3), __attribute__ ((unused)) signed int (*_adapterFi_14titerator_type14titerator_type_M_PP)(void (*__anonymous_object4)(), void *__anonymous_object5, void *__anonymous_object6), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type_P_M)(void (*__anonymous_object7)(), __attribute__ ((unused)) void *___retval__operator_preincr__14titerator_type_1, void *__anonymous_object8), __attribute__ ((unused)) void (*_adapterF_P9telt_type9telt_type__MP)(void (*__anonymous_object9)(), void *__anonymous_object10, void *__anonymous_object11), __attribute__ ((unused)) void (*_adapterF9telt_type_P9telt_type9telt_type_P_MP)(void (*__anonymous_object12)(), __attribute__ ((unused)) void *___retval__operator_assign__9telt_type_1, void *__anonymous_object13, void *__anonymous_object14), __attribute__ ((unused)) void (*_adapterF_P14titerator_type14titerator_type__MP)(void (*__anonymous_object15)(), void *__anonymous_object16, void *__anonymous_object17), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type14titerator_type_P_MP)(void (*__anonymous_object18)(), __attribute__ ((unused)) void *___retval__operator_assign__14titerator_type_1, void *__anonymous_object19, void *__anonymous_object20), __attribute__ ((unused)) unsigned long int _sizeof_14titerator_type, __attribute__ ((unused)) unsigned long int _alignof_14titerator_type, __attribute__ ((unused)) unsigned long int _sizeof_9telt_type, __attribute__ ((unused)) unsigned long int _alignof_9telt_type, __attribute__ ((unused)) void *(*___operator_assign__PF14titerator_type_R14titerator_type14titerator_type__1)(void *__anonymous_object21, void *__anonymous_object22), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type__1)(void *__anonymous_object23), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type14titerator_type__1)(void *__anonymous_object24, void *__anonymous_object25), __attribute__ ((unused)) void (*___destructor__PF_R14titerator_type__1)(void *__anonymous_object26), __attribute__ ((unused)) void *(*___operator_assign__PF9telt_type_R9telt_type9telt_type__1)(void *__anonymous_object27, void *__anonymous_object28), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type__1)(void *__anonymous_object29), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type9telt_type__1)(void *__anonymous_object30, void *__anonymous_object31), __attribute__ ((unused)) void (*___destructor__PF_R9telt_type__1)(void *__anonymous_object32), __attribute__ ((unused)) void *(*___operator_preincr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object33), __attribute__ ((unused)) void *(*___operator_predecr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object34), __attribute__ ((unused)) signed int (*___operator_equal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object35, void *__anonymous_object36), __attribute__ ((unused)) signed int (*___operator_notequal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object37, void *__anonymous_object38), __attribute__ ((unused)) void *(*___operator_deref__PFR9telt_type_14titerator_type__1)(void *__anonymous_object39), void *__begin__14titerator_type_1, void *__end__14titerator_type_1, void (*__func__PF_9telt_type__1)(void *__anonymous_object40)); void __for_each_reverse__A0_2_0_0____operator_assign__PFd0_Rd0d0____constructor__PF_Rd0____constructor__PF_Rd0d0____destructor__PF_Rd0____operator_assign__PFd1_Rd1d1____constructor__PF_Rd1____constructor__PF_Rd1d1____destructor__PF_Rd1____operator_preincr__PFd0_Rd0____operator_predecr__PFd0_Rd0____operator_equal__PFi_d0d0____operator_notequal__PFi_d0d0____operator_deref__PFRd1_d0__F_d0d0PF_d1___1(__attribute__ ((unused)) void (*_adapterF_9telt_type__P)(void (*__anonymous_object41)(), void *__anonymous_object42), __attribute__ ((unused)) void *(*_adapterFP9telt_type_14titerator_type_M_P)(void (*__anonymous_object43)(), void *__anonymous_object44), __attribute__ ((unused)) signed int (*_adapterFi_14titerator_type14titerator_type_M_PP)(void (*__anonymous_object45)(), void *__anonymous_object46, void *__anonymous_object47), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type_P_M)(void (*__anonymous_object48)(), __attribute__ ((unused)) void *___retval__operator_preincr__14titerator_type_1, void *__anonymous_object49), __attribute__ ((unused)) void (*_adapterF_P9telt_type9telt_type__MP)(void (*__anonymous_object50)(), void *__anonymous_object51, void *__anonymous_object52), __attribute__ ((unused)) void (*_adapterF9telt_type_P9telt_type9telt_type_P_MP)(void (*__anonymous_object53)(), __attribute__ ((unused)) void *___retval__operator_assign__9telt_type_1, void *__anonymous_object54, void *__anonymous_object55), __attribute__ ((unused)) void (*_adapterF_P14titerator_type14titerator_type__MP)(void (*__anonymous_object56)(), void *__anonymous_object57, void *__anonymous_object58), __attribute__ ((unused)) void (*_adapterF14titerator_type_P14titerator_type14titerator_type_P_MP)(void (*__anonymous_object59)(), __attribute__ ((unused)) void *___retval__operator_assign__14titerator_type_1, void *__anonymous_object60, void *__anonymous_object61), __attribute__ ((unused)) unsigned long int _sizeof_14titerator_type, __attribute__ ((unused)) unsigned long int _alignof_14titerator_type, __attribute__ ((unused)) unsigned long int _sizeof_9telt_type, __attribute__ ((unused)) unsigned long int _alignof_9telt_type, __attribute__ ((unused)) void *(*___operator_assign__PF14titerator_type_R14titerator_type14titerator_type__1)(void *__anonymous_object62, void *__anonymous_object63), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type__1)(void *__anonymous_object64), __attribute__ ((unused)) void (*___constructor__PF_R14titerator_type14titerator_type__1)(void *__anonymous_object65, void *__anonymous_object66), __attribute__ ((unused)) void (*___destructor__PF_R14titerator_type__1)(void *__anonymous_object67), __attribute__ ((unused)) void *(*___operator_assign__PF9telt_type_R9telt_type9telt_type__1)(void *__anonymous_object68, void *__anonymous_object69), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type__1)(void *__anonymous_object70), __attribute__ ((unused)) void (*___constructor__PF_R9telt_type9telt_type__1)(void *__anonymous_object71, void *__anonymous_object72), __attribute__ ((unused)) void (*___destructor__PF_R9telt_type__1)(void *__anonymous_object73), __attribute__ ((unused)) void *(*___operator_preincr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object74), __attribute__ ((unused)) void *(*___operator_predecr__PF14titerator_type_R14titerator_type__1)(void *__anonymous_object75), __attribute__ ((unused)) signed int (*___operator_equal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object76, void *__anonymous_object77), __attribute__ ((unused)) signed int (*___operator_notequal__PFi_14titerator_type14titerator_type__1)(void *__anonymous_object78, void *__anonymous_object79), __attribute__ ((unused)) void *(*___operator_deref__PFR9telt_type_14titerator_type__1)(void *__anonymous_object80), void *__begin__14titerator_type_1, void *__end__14titerator_type_1, void (*__func__PF_9telt_type__1)(void *__anonymous_object81)); @@ -1377,10 +1371,4 @@ } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi___1(); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); -__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); -extern signed int printf(const char *__restrict __format, ...); static inline signed int invoke_main(signed int argc, char **argv, char **envp); signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){