remove some __gshared from elfobj.d (#22994)

Author: WalterBright

compiler/src/dmd/backend/arm/disasmarm.d

@@ -1616,7 +1616,7 @@ void disassemble(uint c) @trusted
             if (imm3)
             {
                 size_t n = snprintf(P5buf3.ptr, P5buf3.length, ((imm3 < 10) ? "LSL #%d" : "LSL #0x%X"), imm3);
-                assert(n <= P5buf3.length);
+                assert(n < P5buf3.length);
                 p5 = P5buf3[0 .. n];
             }
         }
@@ -2908,7 +2908,7 @@ const(char)[] labeltostring(ulong w)
     __gshared char[2 + w.sizeof * 3 + 1] EA;
 
     const n = snprintf(EA.ptr, EA.length, ((w < 10) ? "%lld" : "0x%llX"), w);
-    assert(n <= EA.length);
+    assert(n < EA.length);
     return EA[0 .. n];
 }
 
@@ -2918,7 +2918,7 @@ const(char)[] indexString(uint reg)
     __gshared char[1 + 3 + 1 + 1] EA;
 
     const n = snprintf(EA.ptr, EA.length, "[%s]", regString(1, reg).ptr);
-    assert(n <= EA.length);
+    assert(n < EA.length);
     return EA[0 .. n];
 }
 

compiler/src/dmd/backend/elfobj.d

@@ -2039,14 +2039,6 @@ static if (0)
 }
 }
 
-private char* unsstr(uint value)
-{
-    __gshared char[64] buffer = void;
-
-    snprintf(buffer.ptr, buffer.length, "%d", value);
-    return buffer.ptr;
-}
-
 /*******************************
  * Mangle a name.
  * Params:
@@ -2097,14 +2089,14 @@ private char[] obj_mangle2(ref Symbol s, char[] dest)
             bool cond = tyfunc(s.ty()) && !variadic(s.Stype);
             if (cond)
             {
-                char* pstr = unsstr(type_paramsize(s.Stype));
-                size_t pstrlen = strlen(pstr);
-                size_t dlen = len + 1 + pstrlen;
-
+                char[64] buffer = void;
+                int n = snprintf(buffer.ptr, buffer.length, "%u", type_paramsize(s.Stype));
+                assert(n < buffer.length);
+                size_t dlen = len + 1 + n;
                 setLength(dest, dlen);
                 memcpy(dest.ptr,name,len);
                 dest[len] = '@';
-                memcpy(dest.ptr + 1 + len, pstr, pstrlen + 1);
+                memcpy(dest.ptr + len + 1, buffer.ptr, n + 1);
                 len = dlen;
                 break;
             }
@@ -2530,16 +2522,14 @@ static if (0)
 
 /*******************************
  * Output a relocation entry for a segment
- * Input:
+ * Params:
  *      seg =           where the address is going
  *      offset =        offset within seg
  *      type =          ELF relocation type R_ARCH_XXXX
  *      index =         Related symbol table index
  *      val =           addend or displacement from address
  */
 
-__gshared int relcnt=0;
-
 void ElfObj_addrel(int seg, targ_size_t offset, uint type,
                     IDXSYM symidx, targ_size_t val)
 {
@@ -2548,9 +2538,13 @@ void ElfObj_addrel(int seg, targ_size_t offset, uint type,
     IDXSEC secidx;
 
     //assert(val == 0);
-    relcnt++;
-    //dbg_printf("%d-ElfObj_addrel(seg %d,offset x%x,type x%x,symidx %d,val %d)\n",
-            //relcnt,seg, offset, type, symidx,val);
+    static if (0)
+    {
+        __gshared int relcnt = 0;
+        relcnt++;
+        printf("%d-ElfObj_addrel(seg %d,offset x%x,type x%x,symidx %d,val %d)\n",
+                relcnt, seg, offset, type, symidx,val);
+    }
 
     assert(seg >= 0 && seg < SegData.length);
     segdata = SegData[seg];