Changeset fe1b6a4 for src

Timestamp:

Mar 23, 2017, 5:20:33 PM (9 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:

231f01c, f20dffa

Parents:

1ca52db (diff), 578b637 (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

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• libcfa/Makefile.am (modified) (1 diff)
• libcfa/Makefile.in (modified) (1 diff)
• libcfa/fstream.c (modified) (4 diffs)
• libcfa/iostream.c (modified) (3 diffs)
• tests/.expect/32/KRfunctions.txt (modified) (3 diffs)
• tests/.expect/32/attributes.txt (added)
• tests/.expect/64/KRfunctions.txt (modified) (3 diffs)
• tests/.expect/64/attributes.txt (modified) (4 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/test.py (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -147 +147 @@
 
         void CodeGenerator::visit( ObjectDecl * objectDecl ) {
+                if (objectDecl->get_name().empty()) {
+                        static UniqueName name = { "__anonymous_object" };
+                        objectDecl->set_name( name.newName() );
+                }
+
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );

src/libcfa/Makefile.am

@@ -35 +35 @@
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 
 AM_CCASFLAGS = @CFA_FLAGS@

src/libcfa/Makefile.in

@@ -305 +305 @@
 AUTOMAKE_OPTIONS = subdir-objects
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = limits stdlib math iostream fstream iterator rational assert \

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 16:17:21 2017
-// Update Count     : 221
+// Last Modified On : Thu Mar 23 08:20:41 2017
+// Update Count     : 226
 //
 
@@ -29 +29 @@
 #define IO_MSG "I/O error: "
 
+void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
+        this->file = file;
+        this->sepDefault = sepDefault;
+        this->sepOnOff = sepOnOff;
+        sepSet( this, separator );
+        sepSetCur( this, sepGet( this ) );
+        sepSetTuple( this, tupleSeparator );
+}
+
 _Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
 void sepOn( ofstream * os ) { os->sepOnOff = 1; }
@@ -83 +92 @@
                 exit( EXIT_FAILURE );
         } // if
-        os->file = file;
-        sepOff( os );
-        sepSet( os, " " );
+        ?{}( os, file, 1, 0, " ", ", " );
 } // open
 
@@ -125 +132 @@
 } // fmt
 
-void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
-        this->file = file;
-        this->sepDefault = sepDefault;
-        this->sepOnOff = sepOnOff;
-        sepSet( this, separator );
-        sepSetCur( this, sepGet( this ) );
-        sepSetTuple( this, tupleSeparator );
-}
-
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
 ofstream *sout = &soutFile;

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 17:46:06 2017
-// Update Count     : 359
+// Last Modified On : Thu Mar 23 08:20:40 2017
+// Update Count     : 367
 //
 
@@ -201 +201 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
-        forall( ttype Params ) ostype * prtTuple( T arg, Params rest ) {
-                os | arg;                                                                               // print first argument
-                os | rest;                                                                              // print remaining arguments
-                return os;
-        } // prtTuple
         sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        prtTuple( arg, rest );                                                          // recursively print tuple
+        os | arg;                                                                                       // print first argument
+        os | rest;                                                                                      // print remaining arguments
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
         return os;
@@ -223 +219 @@
         os | '\n';
         flush( os );
-        sepOff( os );
+        sepOff( os );                                                                           // prepare for next line
         return os;
 } // endl

src/tests/.expect/32/KRfunctions.txt

@@ -47 +47 @@
     int ___retval_f5__i_1;
 }
-int (*__f6__FPFi_i__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int ){
-    int (*___retval_f6__PFi_i__1)(int );
+int (*__f6__FPFi_i__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int __anonymous_object0){
+    int (*___retval_f6__PFi_i__1)(int __anonymous_object1);
 }
 int (*__f7__FPFi_ii__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int __a__i_1, int __b__i_1){
@@ -61 +61 @@
 int *(*__f10__FPFPi_ii__iPiPid__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1, double __y__d_1))(int __x__i_1, int __y__i_1){
     int *(*___retval_f10__PFPi_ii__1)(int __x__i_1, int __y__i_1);
-    int *__x__FPi_ii__2(int , int );
+    int *__x__FPi_ii__2(int __anonymous_object2, int __anonymous_object3);
     ((void)(___retval_f10__PFPi_ii__1=__x__FPi_ii__2) /* ?{} */);
     return ((int *(*)(int __x__i_1, int __y__i_1))___retval_f10__PFPi_ii__1);
@@ -79 +79 @@
 const int __fred__FCi___1(){
     const int ___retval_fred__Ci_1;
-    int *(*__x__PFPi_ii__2)(int , int );
+    int *(*__x__PFPi_ii__2)(int __anonymous_object4, int __anonymous_object5);
     int __a__i_2;
     int __b__i_2;

src/tests/.expect/64/KRfunctions.txt

@@ -47 +47 @@
     int ___retval_f5__i_1;
 }
-int (*__f6__FPFi_i__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int ){
-    int (*___retval_f6__PFi_i__1)(int );
+int (*__f6__FPFi_i__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int __anonymous_object0){
+    int (*___retval_f6__PFi_i__1)(int __anonymous_object1);
 }
 int (*__f7__FPFi_ii__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int __a__i_1, int __b__i_1){
@@ -61 +61 @@
 int *(*__f10__FPFPi_ii__iPiPid__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1, double __y__d_1))(int __x__i_1, int __y__i_1){
     int *(*___retval_f10__PFPi_ii__1)(int __x__i_1, int __y__i_1);
-    int *__x__FPi_ii__2(int , int );
+    int *__x__FPi_ii__2(int __anonymous_object2, int __anonymous_object3);
     ((void)(___retval_f10__PFPi_ii__1=__x__FPi_ii__2) /* ?{} */);
     return ((int *(*)(int __x__i_1, int __y__i_1))___retval_f10__PFPi_ii__1);
@@ -79 +79 @@
 const int __fred__FCi___1(){
     const int ___retval_fred__Ci_1;
-    int *(*__x__PFPi_ii__2)(int , int );
+    int *(*__x__PFPi_ii__2)(int __anonymous_object4, int __anonymous_object5);
     int __a__i_2;
     int __b__i_2;

src/tests/.expect/64/attributes.txt

@@ -58 +58 @@
     __attribute__ ((used,unused,unused)) int __f7__i_1;
     __attribute__ ((used,used,unused)) int __f8__i_1;
-    __attribute__ ((unused)) int ;
+    __attribute__ ((unused)) int __anonymous_object0;
     __attribute__ ((unused,unused)) int *__f9__Pi_1;
 };
@@ -226 +226 @@
     int **const ___retval_f2__CPPi_1;
 }
-__attribute__ ((unused,used,unused)) int (*__f3__FPA0i_i__1(int ))[];
+__attribute__ ((unused,used,unused)) int (*__f3__FPA0i_i__1(int __anonymous_object1))[];
 __attribute__ ((unused,unused)) int (*__f3__FPA0i_i__1(int __p__i_1))[]{
     int (*___retval_f3__PA0i_1)[];
 }
-__attribute__ ((unused,used,unused)) int (*__f4__FPFi_i____1())(int );
-__attribute__ ((unused,unused)) int (*__f4__FPFi_i____1())(int ){
-    int (*___retval_f4__PFi_i__1)(int );
+__attribute__ ((unused,used,unused)) int (*__f4__FPFi_i____1())(int __anonymous_object2);
+__attribute__ ((unused,unused)) int (*__f4__FPFi_i____1())(int __anonymous_object3){
+    int (*___retval_f4__PFi_i__1)(int __anonymous_object4);
 }
 __attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long 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 int atexit0(void (*__func)(void), void *, void *);
+__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit0(void (*__func)(void), void *__anonymous_object5, void *__anonymous_object6);
 __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
 __attribute__ ((format(printf, 1, 2))) extern int printf(const char *__restrict __format, ...);
@@ -268 +268 @@
 int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) int **__Foo__PPi_1);
 int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) int *__Foo__Pi_1);
-int __tpr4__Fi_PFi_Pi___1(__attribute__ ((unused,unused)) int (*)(__attribute__ ((unused,unused)) int [((long unsigned int )5)]));
+int __tpr4__Fi_PFi_Pi___1(__attribute__ ((unused,unused)) int (*__anonymous_object7)(__attribute__ ((unused,unused)) int __anonymous_object8[((long unsigned int )5)]));
 int __tpr5__Fi_PFi____1(__attribute__ ((unused,unused,unused)) int (*__Foo__PFi___1)());
 int __tpr6__Fi_PFi____1(__attribute__ ((unused,unused,unused)) int (*__Foo__PFi___1)());
-int __tpr7__Fi_PFi_PFi_i____1(__attribute__ ((unused,unused)) int (*)(__attribute__ ((unused)) int (*)(__attribute__ ((unused,unused)) int )));
+int __tpr7__Fi_PFi_PFi_i____1(__attribute__ ((unused,unused)) int (*__anonymous_object9)(__attribute__ ((unused)) int (*__anonymous_object10)(__attribute__ ((unused,unused)) int __anonymous_object11)));
 int __ad__Fi___1(){
     int ___retval_ad__i_1;
@@ -320 +320 @@
     ((void)sizeof(enum __anonymous5 ));
 }
-int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *, __attribute__ ((unused,unused,unused)) int *);
-int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) int **, __attribute__ ((unused,unused,unused,unused)) int **);
-int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *, __attribute__ ((unused,unused,unused)) int *);
-int __apd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*)(), __attribute__ ((unused,unused,unused)) int (*)());
-int __apd5__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*)(__attribute__ ((unused)) int ), __attribute__ ((unused,unused,unused)) int (*)(__attribute__ ((unused)) int ));
-int __apd6__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*)(), __attribute__ ((unused,unused,unused)) int (*)());
-int __apd7__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*)(__attribute__ ((unused)) int ), __attribute__ ((unused,unused,unused)) int (*)(__attribute__ ((unused)) int ));
+int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object12, __attribute__ ((unused,unused,unused)) int *__anonymous_object13);
+int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) int **__anonymous_object14, __attribute__ ((unused,unused,unused,unused)) int **__anonymous_object15);
+int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object16, __attribute__ ((unused,unused,unused)) int *__anonymous_object17);
+int __apd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object18)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object19)());
+int __apd5__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object20)(__attribute__ ((unused)) int __anonymous_object21), __attribute__ ((unused,unused,unused)) int (*__anonymous_object22)(__attribute__ ((unused)) int __anonymous_object23));
+int __apd6__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object24)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object25)());
+int __apd7__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object26)(__attribute__ ((unused)) int __anonymous_object27), __attribute__ ((unused,unused,unused)) int (*__anonymous_object28)(__attribute__ ((unused)) int __anonymous_object29));
 struct Vad {
-    __attribute__ ((unused)) int ;
-    __attribute__ ((unused,unused)) int *;
-    __attribute__ ((unused,unused)) int [((long unsigned int )10)];
-    __attribute__ ((unused,unused)) int (*)();
+    __attribute__ ((unused)) int __anonymous_object30;
+    __attribute__ ((unused,unused)) int *__anonymous_object31;
+    __attribute__ ((unused,unused)) int __anonymous_object32[((long unsigned int )10)];
+    __attribute__ ((unused,unused)) int (*__anonymous_object33)();
 };
 static inline void ___constructor__F_P4sVad_autogen___1(struct Vad *___dst__P4sVad_1);

src/tests/Makefile.am

@@ -51 +51 @@
         @+python test.py --list --concurrent=${concurrent}
 
+.dummy : .dummy.c
+        ${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+
 constant0-1DP : constant0-1.c
         ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}

src/tests/Makefile.in

@@ -669 +669 @@
         @+python test.py --list --concurrent=${concurrent}
 
+.dummy : .dummy.c
+        ${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+
 constant0-1DP : constant0-1.c
         ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}

src/tests/test.py

@@ -25 +25 @@
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
-        sh('echo "int main() { return 0; }" > .dummy.c')
+        sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
         sh("make .dummy", print2stdout=False)
         _, out = sh("file .dummy", print2stdout=False)