Changeset 641707d

Timestamp:

Jan 31, 2025, 1:52:18 PM (4 weeks ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

bbbff10

Parents:

372d33c

Message:

More fixing of warnings. Including another error that slipped through to the build and the rest of the 'easy' fixes on tests not in a directory.

Files:

• libcfa/src/collections/vector.hfa (modified) (1 diff)
• tests/.expect/attributes.x86.txt (modified) (6 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/math.cfa (modified) (1 diff)
• tests/minmax.cfa (modified) (1 diff)
• tests/operators.cfa (modified) (4 diffs)
• tests/poly-many-arsz.cfa (modified) (2 diffs)
• tests/polymorphism.cfa (modified) (4 diffs)
• tests/shortCircuit.cfa (modified) (5 diffs)
• tests/sum.cfa (modified) (1 diff)
• tests/switch.cfa (modified) (6 diffs)
• tests/userLiterals.cfa (modified) (1 diff)

libcfa/src/collections/vector.hfa ¶

@@ -97 +97 @@
 static inline void reserve(vector(T, allocator_t)* this, size_t size)
 {
-        realloc_storage(&this->storage, this->size+1);
+        realloc_storage(&this->storage, size);
 }
 

tests/.expect/attributes.x86.txt ¶

@@ -1177 +1177 @@
     __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1;
     {
-        ((void)((*((signed int ***)(&_X10_retval_f2KPPi_1)))=((void*)((unsigned long int )0))) /* ?{} */);
+        ((void)((*((signed int ***)(&_X10_retval_f2KPPi_1)))=((void*)((unsigned int )0))) /* ?{} */);
     }
 
@@ -1191 +1191 @@
 
     {
-        ((void)(_X10_retval_f5PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
+        ((void)(_X10_retval_f5PA0i_1=((void*)((unsigned int )0))) /* ?{} */);
     }
 
@@ -1203 +1203 @@
 
     {
-        ((void)(_X10_retval_f6PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
+        ((void)(_X10_retval_f6PA0i_1=((void*)((unsigned int )0))) /* ?{} */);
     }
 
@@ -1212 +1212 @@
     __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0);
     {
-        ((void)(_X10_retval_f8Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
+        ((void)(_X10_retval_f8Fi_i__1=((void*)((unsigned int )0))) /* ?{} */);
     }
 
@@ -1220 +1220 @@
     __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0);
     {
-        ((void)(_X10_retval_f9Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
+        ((void)(_X10_retval_f9Fi_i__1=((void*)((unsigned int )0))) /* ?{} */);
     }
 
@@ -1228 +1228 @@
     __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0);
     {
-        ((void)(_X11_retval_f10Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
+        ((void)(_X11_retval_f10Fi_i__1=((void*)((unsigned int )0))) /* ?{} */);
     }
 

tests/Makefile.am ¶

@@ -109 +109 @@
         io/manipulatorsInput-uchunk \
         io/many_read \
-        math \
-        minmax \
-        operators \
-        poly-many-arsz \
-        polymorphism \
         raii/ctor-autogen \
         raii/dtor-early-exit \
         raii/init_once \
         references \
-        shortCircuit \
-        sum \
-        switch \
         tuple/tupleCast \
-        tuple/tupleMember \
-        userLiterals \
-        vector
+        tuple/tupleMember
 
 WFLAGS=${if ${filter ${WFLGAS_OPT_LAX},${@}},${WFLAGS_LAX},${WFLAGS_STRICT}}

tests/math.cfa ¶

@@ -55 +55 @@
 
         struct S { int i; };
-        double ?*?( double d, S s ) { return d * s.i; }
-        double ?/?( double d, S s ) { return d / s.i; }
         S ?\?( S s, unsigned long y ) { return (S){ s.i \ y }; }
         ofstream & ?|?( ofstream & os, S s ) { return os | s.i; }

tests/minmax.cfa ¶

@@ -18 +18 @@
 
 int main( void ) {
-        // char does not have less or greater than.
-        int ?<?( char op1, char op2 ) { return (int)op1 < (int)op2; }
-        int ?>?( char op1, char op2 ) { return (int)op1 > (int)op2; }
-
         sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' );
         sout | "signed int\t\t"                         | 4 | -3 | "\tmin" | min( 4, -3 );

tests/operators.cfa ¶

@@ -1 @@
-int ?*?( int a, int b ) {
+int ?*?( int, int ) {
         return 0;
 }
@@ -7 +7 @@
 }
 
-int ?+?( int a, int b ) {
+int ?+?( int, int ) {
         return 0;
 }
 
-int ?=?( int &a, int b ) {
+int ?=?( int &, int ) {
         return 0;
 }
@@ -18 +18 @@
 };
 
-char ?()( struct accumulator a, char number1, char number2 ) {
+char ?()( struct accumulator, char, char ) {
         return 'a';
 }
 
 void f( void ) {
-        char a, b;
+        char a = 0, b = 0;
         ?()( a, b );
         a(b);
@@ -29 +29 @@
 }
 
-int main(int argc, char const *argv[]) {
+int main() {
         /* code */
         printf( "done\n" );                             // non-empty .expect file

tests/poly-many-arsz.cfa ¶

@@ -29 +29 @@
 
     mypair(char[2], char) y @= {};
-    printf("|y| = %ld\n", sizeof(y));    // 3
+    printf("|y| = %zd\n", sizeof(y));    // 3
 
     y.second = 0;
@@ -43 +43 @@
     // adding this declaration of x ...
     mypair(char[1], char) x @= {};
-    printf("|x| = %ld\n", sizeof(x));    // 2
+    printf("|x| = %zd\n", sizeof(x));    // 2
+
+    // ... even if it isn't really used ...
+    (void)x;
 
     // ... must not affect the observed facts of y:
 
     mypair(char[2], char) y @= {};
-    printf("|y| = %ld\n", sizeof(y));    // 3
+    printf("|y| = %zd\n", sizeof(y));    // 3
 
     y.second = 0;

tests/polymorphism.cfa ¶

@@ -29 +29 @@
 
 forall( T, U )
-size_t struct_size( T i, U j ) {
+size_t struct_size( T, U ) {
         struct S { T i; U j; };
         return sizeof(S);
@@ -35 +35 @@
 
 forall( T, U )
-size_t union_size( T i, U j ) {
+size_t union_size( T, U ) {
         union B { T i; U j; };
         return sizeof(B);
@@ -42 +42 @@
 // perform some simple operations on aggregates of T and U
 forall( T | { void print(T); int ?==?(T, T); }, U | { void print(U); U ?=?(U&, zero_t); } )
-U foo(T i, U j) {
+U foo(T i, U) {
         struct S { T i; U j; };
         union B { T i; U j; };
@@ -68 +68 @@
                 double & x_inner_double = x; \
                 float  & x_inner_float  = x; \
-                printf("  offset of inner double: %ld\n", ((char *) & x_inner_double) - ((char *) & x) ); \
-                printf("  offset of inner float:  %ld\n", ((char *) & x_inner_float ) - ((char *) & x) );
+                printf("  offset of inner double: %zd\n", ((char *) & x_inner_double) - ((char *) & x) ); \
+                printf("  offset of inner float:  %zd\n", ((char *) & x_inner_float ) - ((char *) & x) );
 
         void showStatic( thing(long long int) & x ) {

tests/shortCircuit.cfa ¶

@@ -1 +1 @@
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-// 
+//
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// shortCircuit.cfa -- 
-// 
+//
+// shortCircuit.cfa --
+//
 // Author           : Peter A. Buhr
 // Created On       : Thu Jan 28 18:26:16 2016
@@ -12 +12 @@
 // Last Modified On : Tue Dec  4 18:26:05 2018
 // Update Count     : 4
-// 
+//
 
-void g( float f ) {}
-void g( int i ) {}
+void g( float ) {}
+void g( int ) {}
 
 void f( int a ) {
-        int b;
-        float c;
+        int b = 0;
+        float c = 0;
         g( a ? b : c );
         g( a && c );
@@ -26 +26 @@
 
 void g() {
-        int a;
-        struct { int b; } a;
+        int a = 1;
+        struct Int { int b; } a = { 0 };
         if ( a ) {
                 while ( a ) {
@@ -35 +35 @@
                 }
         }
+        // This should never be resolved to.
+        (void)(Int)a;
 }
 
@@ -43 +45 @@
 };
 
-int ?!=?( test_t lhs, int rhs ) {
+int ?!=?( test_t lhs, zero_t ) {
         sout | lhs.x | " ";
         return lhs.x != 0;
 }
 
-int main( int argc, char const *argv[] ) {
+int main() {
         sout | nlOff;
         test_t true_val, false_val;

tests/sum.cfa ¶

@@ -87 +87 @@
         struct S { int i, j; };
         void ?{}( S & s ) { s.[i, j] = 0; }
-        void ?{}( S & s, int i ) { s.[i, j] = [i, 0]; }
         void ?{}( S & s, int i, int j ) { s.[i, j] = [i, j]; }
         void ?{}( S & s, zero_t ) { s.[i, j] = 0; }

tests/switch.cfa ¶

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// switch.cfa -- 
+// switch.cfa --
 //
 // Author           : Peter A. Buhr
@@ -12 +12 @@
 // Last Modified On : Fri Jan 17 14:10:12 2025
 // Update Count     : 45
-// 
+//
 
 int f( int i ) { return i; }
@@ -57 +57 @@
           default:
                 i = 3;
+                s = (S){ -7 };
+                fallthrough;
           case 19:
           case 'A' ... 'Z':
@@ -63 +65 @@
                 j = 3;
                 f( 3 );
+                k = 5;
                 break;
         } // switch
@@ -92 +95 @@
                 i = 3;
                 f( 3 );
+                s = (S){ -7 };
           default:
                 j = 3;
@@ -98 +102 @@
                 fallthrough;
           case 'd':
-                j = 5;
+                k = 5;
         } // choose
 

tests/userLiterals.cfa ¶

@@ -15 +15 @@
 
 #include <fstream.hfa>
+#include <uchar.h>
+
+// Warning triggered by the standard header, we can't fix that.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
 #include <wchar.h>
-#include <uchar.h>
+#pragma GCC diagnostic pop
 
 int ?`s( int s ) { sout | "secs" | s; return s; }