Merge pull request #601 from lionello/bug259

MartinNowak · MartinNowak · commit 439d079dce00 · 2013-09-22T14:11:34.000-07:00
Bug259: fixed signed-unsigned comparisons in druntime
diff --git a/src/core/sys/windows/stacktrace.d b/src/core/sys/windows/stacktrace.d
@@ -258,7 +258,7 @@ private:
         char[2+2*size_t.sizeof+1] buf=void;
 
         immutable len = snprintf(buf.ptr, buf.length, "0x%p", pc);
-        len < buf.length || assert(0);
+        cast(uint)len < buf.length || assert(0);
         return buf[0 .. len].dup;
     }
 
@@ -290,7 +290,7 @@ private:
         res ~= fileName[0 .. strlen(fileName)];
         res ~= "(";
         immutable len = snprintf(buf.ptr, buf.length, "%u", lineNum);
-        len < buf.length || assert(0);
+        cast(uint)len < buf.length || assert(0);
         res ~= buf[0 .. len];
         res ~= ")";
         return res;
diff --git a/src/rt/deh_win64_posix.d b/src/rt/deh_win64_posix.d
@@ -278,7 +278,7 @@ extern (C) void _d_throwc(Object h)
         debug(PRINTF)
         {
             printf("handler_info[%d]:\n", dim);
-            for (int i = 0; i < dim; i++)
+            for (uint i = 0; i < dim; i++)
             {
                 auto phi = &handler_table.handler_info.ptr[i];
                 printf("\t[%d]: offset = x%04x, endoffset = x%04x, prev_index = %d, cioffset = x%04x, finally_offset = %x\n",
@@ -287,7 +287,7 @@ extern (C) void _d_throwc(Object h)
         }
 
         auto index = -1;
-        for (int i = 0; i < dim; i++)
+        for (uint i = 0; i < dim; i++)
         {
             auto phi = &handler_table.handler_info.ptr[i];
 
@@ -345,7 +345,7 @@ extern (C) void _d_throwc(Object h)
 
                 auto pci = cast(DCatchInfo *)(cast(char *)handler_table + phi.cioffset);
                 auto ncatches = pci.ncatches;
-                for (int i = 0; i < ncatches; i++)
+                for (uint i = 0; i < ncatches; i++)
                 {
                     auto ci = **cast(ClassInfo **)h;
 
diff --git a/src/rt/dmain2.d b/src/rt/dmain2.d
@@ -336,7 +336,7 @@ extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc)
         immutable size_t totalArgsLength = WideCharToMultiByte(65001, 0, wCommandLine, cast(int)wCommandLineLength, null, 0, null, null);
         {
             char* totalArgsBuff = cast(char*) alloca(totalArgsLength);
-            int j = 0;
+            size_t j = 0;
             foreach (i; 0 .. wargc)
             {
                 immutable size_t wlen = wcslen(wargs[i]);
diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
@@ -463,13 +463,13 @@ BlkInfo *__getBlkInfo(void *interior)
         auto curi = ptr + __nextBlkIdx;
         for(auto i = curi; i >= ptr; --i)
         {
-            if(i.base && i.base <= interior && (interior - i.base) < i.size)
+            if(i.base && i.base <= interior && cast(size_t)(interior - i.base) < i.size)
                 return i;
         }
 
         for(auto i = ptr + N_CACHE_BLOCKS - 1; i > curi; --i)
         {
-            if(i.base && i.base <= interior && (interior - i.base) < i.size)
+            if(i.base && i.base <= interior && cast(size_t)(interior - i.base) < i.size)
                 return i;
         }
     }
@@ -2039,7 +2039,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)
     {
         byte[]* p = cast(byte[]*)(&n + 1);
 
-        for (auto i = 0; i < n; i++)
+        for (auto i = 0u; i < n; i++)
         {
             byte[] b = *p++;
             length += b.length;
@@ -2060,7 +2060,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)
         __va_list argsave = __va_argsave.va;
         va_list ap;
         va_start(ap, __va_argsave);
-        for (auto i = 0; i < n; i++)
+        for (auto i = 0u; i < n; i++)
         {
             byte[] b;
             va_arg(ap, b);
@@ -2082,7 +2082,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)
         p = cast(byte[]*)(&n + 1);
 
         size_t j = 0;
-        for (auto i = 0; i < n; i++)
+        for (auto i = 0u; i < n; i++)
         {
             byte[] b = *p++;
             if (b.length)
@@ -2111,7 +2111,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)
     {
         va_list ap2 = &argsave;
         size_t j = 0;
-        for (auto i = 0; i < n; i++)
+        for (auto i = 0u; i < n; i++)
         {
             byte[] b;
             va_arg(ap2, b);
diff --git a/src/rt/switch_.d b/src/rt/switch_.d
@@ -35,9 +35,7 @@ in
     assert(ca.length >= 0);
 
     // Make sure table[] is sorted correctly
-    int j;
-
-    for (j = 1; j < table.length; j++)
+    for (size_t j = 1u; j < table.length; j++)
     {
         auto len1 = table[j - 1].length;
         auto len2 = table[j].length;
@@ -54,14 +52,13 @@ in
 }
 out (result)
 {
-    int i;
     int cj;
 
     //printf("out _d_switch_string()\n");
     if (result == -1)
     {
         // Not found
-        for (i = 0; i < table.length; i++)
+        for (auto i = 0u; i < table.length; i++)
         {
             if (table[i].length == ca.length)
             {   cj = memcmp(table[i].ptr, ca.ptr, ca.length);
@@ -71,8 +68,8 @@ out (result)
     }
     else
     {
-        assert(0 <= result && result < table.length);
-        for (i = 0; 1; i++)
+        assert(0 <= result && cast(size_t)result < table.length);
+        for (auto i = 0u; 1; i++)
         {
             assert(i < table.length);
             if (table[i].length == ca.length)
@@ -182,9 +179,7 @@ in
     assert(ca.length >= 0);
 
     // Make sure table[] is sorted correctly
-    int j;
-
-    for (j = 1; j < table.length; j++)
+    for (size_t j = 1u; j < table.length; j++)
     {
         auto len1 = table[j - 1].length;
         auto len2 = table[j].length;
@@ -201,14 +196,13 @@ in
 }
 out (result)
 {
-    int i;
     int c;
 
     //printf("out _d_switch_ustring()\n");
     if (result == -1)
     {
         // Not found
-        for (i = 0; i < table.length; i++)
+        for (auto i = 0u; i < table.length; i++)
         {
             if (table[i].length == ca.length)
             {   c = memcmp(table[i].ptr, ca.ptr, ca.length * wchar.sizeof);
@@ -218,8 +212,8 @@ out (result)
     }
     else
     {
-        assert(0 <= result && result < table.length);
-        for (i = 0; 1; i++)
+        assert(0 <= result && cast(size_t)result < table.length);
+        for (auto i = 0u; 1; i++)
         {
             assert(i < table.length);
             if (table[i].length == ca.length)
@@ -315,7 +309,7 @@ in
     assert(ca.length >= 0);
 
     // Make sure table[] is sorted correctly
-    for (auto j = 1; j < table.length; j++)
+    for (auto j = 1u; j < table.length; j++)
     {
         auto len1 = table[j - 1].length;
         auto len2 = table[j].length;
@@ -334,7 +328,7 @@ out (result)
     if (result == -1)
     {
         // Not found
-        for (auto i = 0; i < table.length; i++)
+        for (auto i = 0u; i < table.length; i++)
         {
             if (table[i].length == ca.length)
             {   auto c = memcmp(table[i].ptr, ca.ptr, ca.length * dchar.sizeof);
@@ -344,8 +338,8 @@ out (result)
     }
     else
     {
-        assert(0 <= result && result < table.length);
-        for (auto i = 0; 1; i++)
+        assert(0 <= result && cast(size_t)result < table.length);
+        for (auto i = 0u; 1; i++)
         {
             assert(i < table.length);
             if (table[i].length == ca.length)

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ extern (C) void _d_throwc(Object h)`
`278`	`278`	`debug(PRINTF)`
`279`	`279`	`{`
`280`	`280`	`printf("handler_info[%d]:\n", dim);`
`281`		`- for (int i = 0; i < dim; i++)`
	`281`	`+ for (uint i = 0; i < dim; i++)`
`282`	`282`	`{`
`283`	`283`	`auto phi = &handler_table.handler_info.ptr[i];`
`284`	`284`	`printf("\t[%d]: offset = x%04x, endoffset = x%04x, prev_index = %d, cioffset = x%04x, finally_offset = %x\n",`
`@@ -287,7 +287,7 @@ extern (C) void _d_throwc(Object h)`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`auto index = -1;`
`290`		`- for (int i = 0; i < dim; i++)`
	`290`	`+ for (uint i = 0; i < dim; i++)`
`291`	`291`	`{`
`292`	`292`	`auto phi = &handler_table.handler_info.ptr[i];`
`293`	`293`
`@@ -345,7 +345,7 @@ extern (C) void _d_throwc(Object h)`
`345`	`345`
`346`	`346`	`auto pci = cast(DCatchInfo )(cast(char )handler_table + phi.cioffset);`
`347`	`347`	`auto ncatches = pci.ncatches;`
`348`		`- for (int i = 0; i < ncatches; i++)`
	`348`	`+ for (uint i = 0; i < ncatches; i++)`
`349`	`349`	`{`
`350`	`350`	`auto ci = cast(ClassInfo )h;`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc)`
`336`	`336`	`immutable size_t totalArgsLength = WideCharToMultiByte(65001, 0, wCommandLine, cast(int)wCommandLineLength, null, 0, null, null);`
`337`	`337`	`{`
`338`	`338`	`char* totalArgsBuff = cast(char*) alloca(totalArgsLength);`
`339`		`- int j = 0;`
	`339`	`+ size_t j = 0;`
`340`	`340`	`foreach (i; 0 .. wargc)`
`341`	`341`	`{`
`342`	`342`	`immutable size_t wlen = wcslen(wargs[i]);`
Original file line number	Diff line number	Diff line change
`@@ -463,13 +463,13 @@ BlkInfo __getBlkInfo(void interior)`
`463`	`463`	`auto curi = ptr + __nextBlkIdx;`
`464`	`464`	`for(auto i = curi; i >= ptr; --i)`
`465`	`465`	`{`
`466`		`- if(i.base && i.base <= interior && (interior - i.base) < i.size)`
	`466`	`+ if(i.base && i.base <= interior && cast(size_t)(interior - i.base) < i.size)`
`467`	`467`	`return i;`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`for(auto i = ptr + N_CACHE_BLOCKS - 1; i > curi; --i)`
`471`	`471`	`{`
`472`		`- if(i.base && i.base <= interior && (interior - i.base) < i.size)`
	`472`	`+ if(i.base && i.base <= interior && cast(size_t)(interior - i.base) < i.size)`
`473`	`473`	`return i;`
`474`	`474`	`}`
`475`	`475`	`}`
`@@ -2039,7 +2039,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)`
`2039`	`2039`	`{`
`2040`	`2040`	`byte[]* p = cast(byte[]*)(&n + 1);`
`2041`	`2041`
`2042`		`- for (auto i = 0; i < n; i++)`
	`2042`	`+ for (auto i = 0u; i < n; i++)`
`2043`	`2043`	`{`
`2044`	`2044`	`byte[] b = *p++;`
`2045`	`2045`	`length += b.length;`
`@@ -2060,7 +2060,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)`
`2060`	`2060`	`__va_list argsave = __va_argsave.va;`
`2061`	`2061`	`va_list ap;`
`2062`	`2062`	`va_start(ap, __va_argsave);`
`2063`		`- for (auto i = 0; i < n; i++)`
	`2063`	`+ for (auto i = 0u; i < n; i++)`
`2064`	`2064`	`{`
`2065`	`2065`	`byte[] b;`
`2066`	`2066`	`va_arg(ap, b);`
`@@ -2082,7 +2082,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)`
`2082`	`2082`	`p = cast(byte[]*)(&n + 1);`
`2083`	`2083`
`2084`	`2084`	`size_t j = 0;`
`2085`		`- for (auto i = 0; i < n; i++)`
	`2085`	`+ for (auto i = 0u; i < n; i++)`
`2086`	`2086`	`{`
`2087`	`2087`	`byte[] b = *p++;`
`2088`	`2088`	`if (b.length)`
`@@ -2111,7 +2111,7 @@ extern (C) void[] _d_arraycatnT(const TypeInfo ti, uint n, ...)`
`2111`	`2111`	`{`
`2112`	`2112`	`va_list ap2 = &argsave;`
`2113`	`2113`	`size_t j = 0;`
`2114`		`- for (auto i = 0; i < n; i++)`
	`2114`	`+ for (auto i = 0u; i < n; i++)`
`2115`	`2115`	`{`
`2116`	`2116`	`byte[] b;`
`2117`	`2117`	`va_arg(ap2, b);`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ in`
`35`	`35`	`assert(ca.length >= 0);`
`36`	`36`
`37`	`37`	`// Make sure table[] is sorted correctly`
`38`		`- int j;`
`39`		`-`
`40`		`- for (j = 1; j < table.length; j++)`
	`38`	`+ for (size_t j = 1u; j < table.length; j++)`
`41`	`39`	`{`
`42`	`40`	`auto len1 = table[j - 1].length;`
`43`	`41`	`auto len2 = table[j].length;`
`@@ -54,14 +52,13 @@ in`
`54`	`52`	`}`
`55`	`53`	`out (result)`
`56`	`54`	`{`
`57`		`- int i;`
`58`	`55`	`int cj;`
`59`	`56`
`60`	`57`	`//printf("out _d_switch_string()\n");`
`61`	`58`	`if (result == -1)`
`62`	`59`	`{`
`63`	`60`	`// Not found`
`64`		`- for (i = 0; i < table.length; i++)`
	`61`	`+ for (auto i = 0u; i < table.length; i++)`
`65`	`62`	`{`
`66`	`63`	`if (table[i].length == ca.length)`
`67`	`64`	`{ cj = memcmp(table[i].ptr, ca.ptr, ca.length);`
`@@ -71,8 +68,8 @@ out (result)`
`71`	`68`	`}`
`72`	`69`	`else`
`73`	`70`	`{`
`74`		`- assert(0 <= result && result < table.length);`
`75`		`- for (i = 0; 1; i++)`
	`71`	`+ assert(0 <= result && cast(size_t)result < table.length);`
	`72`	`+ for (auto i = 0u; 1; i++)`
`76`	`73`	`{`
`77`	`74`	`assert(i < table.length);`
`78`	`75`	`if (table[i].length == ca.length)`
`@@ -182,9 +179,7 @@ in`
`182`	`179`	`assert(ca.length >= 0);`
`183`	`180`
`184`	`181`	`// Make sure table[] is sorted correctly`
`185`		`- int j;`
`186`		`-`
`187`		`- for (j = 1; j < table.length; j++)`
	`182`	`+ for (size_t j = 1u; j < table.length; j++)`
`188`	`183`	`{`
`189`	`184`	`auto len1 = table[j - 1].length;`
`190`	`185`	`auto len2 = table[j].length;`
`@@ -201,14 +196,13 @@ in`
`201`	`196`	`}`
`202`	`197`	`out (result)`
`203`	`198`	`{`
`204`		`- int i;`
`205`	`199`	`int c;`
`206`	`200`
`207`	`201`	`//printf("out _d_switch_ustring()\n");`
`208`	`202`	`if (result == -1)`
`209`	`203`	`{`
`210`	`204`	`// Not found`
`211`		`- for (i = 0; i < table.length; i++)`
	`205`	`+ for (auto i = 0u; i < table.length; i++)`
`212`	`206`	`{`
`213`	`207`	`if (table[i].length == ca.length)`
`214`	`208`	`{ c = memcmp(table[i].ptr, ca.ptr, ca.length * wchar.sizeof);`
`@@ -218,8 +212,8 @@ out (result)`
`218`	`212`	`}`
`219`	`213`	`else`
`220`	`214`	`{`
`221`		`- assert(0 <= result && result < table.length);`
`222`		`- for (i = 0; 1; i++)`
	`215`	`+ assert(0 <= result && cast(size_t)result < table.length);`
	`216`	`+ for (auto i = 0u; 1; i++)`
`223`	`217`	`{`
`224`	`218`	`assert(i < table.length);`
`225`	`219`	`if (table[i].length == ca.length)`
`@@ -315,7 +309,7 @@ in`
`315`	`309`	`assert(ca.length >= 0);`
`316`	`310`
`317`	`311`	`// Make sure table[] is sorted correctly`
`318`		`- for (auto j = 1; j < table.length; j++)`
	`312`	`+ for (auto j = 1u; j < table.length; j++)`
`319`	`313`	`{`
`320`	`314`	`auto len1 = table[j - 1].length;`
`321`	`315`	`auto len2 = table[j].length;`
`@@ -334,7 +328,7 @@ out (result)`
`334`	`328`	`if (result == -1)`
`335`	`329`	`{`
`336`	`330`	`// Not found`
`337`		`- for (auto i = 0; i < table.length; i++)`
	`331`	`+ for (auto i = 0u; i < table.length; i++)`
`338`	`332`	`{`
`339`	`333`	`if (table[i].length == ca.length)`
`340`	`334`	`{ auto c = memcmp(table[i].ptr, ca.ptr, ca.length * dchar.sizeof);`
`@@ -344,8 +338,8 @@ out (result)`
`344`	`338`	`}`
`345`	`339`	`else`
`346`	`340`	`{`
`347`		`- assert(0 <= result && result < table.length);`
`348`		`- for (auto i = 0; 1; i++)`
	`341`	`+ assert(0 <= result && cast(size_t)result < table.length);`
	`342`	`+ for (auto i = 0u; 1; i++)`
`349`	`343`	`{`
`350`	`344`	`assert(i < table.length);`
`351`	`345`	`if (table[i].length == ca.length)`