Merge pull request #2903 from kinke/execinfo

[stable] Small follow-up to core.internal.execinfo refactoring
merged-on-behalf-of: Petar Kirov <[email protected]>

Author: dlang-bot

src/core/internal/execinfo.d

@@ -195,39 +195,37 @@ const(char)[] getMangledSymbolName(const(char)[] btBuf, out size_t symBeg,
     }
     else
     {
-        import core.stdc.string : memchr;
-
-        char pChar = '+';
-        char mChar = '-';
-
         static if (BacktraceFmt.GNU)
         {
-            char bChar = '(';
-            char eChar = ')';
+            enum bChar = '(';
+            enum eChar = ')';
         }
         else static if (BacktraceFmt.BSD)
         {
-            char bChar = '<';
-            char eChar = '>';
+            enum bChar = '<';
+            enum eChar = '>';
         }
         else static if (BacktraceFmt.Solaris)
         {
-            char bChar = '\'';
-            char eChar = '+';
+            enum bChar = '\'';
+            enum eChar = '+';
         }
 
-        if (auto bptr = cast(char*) memchr(btBuf.ptr, bChar, btBuf.length))
+        foreach (i; 0 .. btBuf.length)
         {
-            ++bptr; // skip bChar
-            if (auto eptr = cast(char*) memchr(bptr, eChar, (btBuf.ptr + btBuf.length) - bptr))
+            if (btBuf[i] == bChar)
             {
-                if (auto pptr = cast(char*) memchr(bptr, pChar, eptr - bptr))
-                    eptr = pptr;
-                if (auto mptr = cast(char*) memchr(bptr, mChar, eptr - bptr))
-                    eptr = mptr;
-
-                symBeg = bptr - btBuf.ptr;
-                symEnd = eptr - btBuf.ptr;
+                foreach (j; i+1 .. btBuf.length)
+                {
+                    const e = btBuf[j];
+                    if (e == eChar || e == '+' || e == '-')
+                    {
+                        symBeg = i + 1;
+                        symEnd = j;
+                        break;
+                    }
+                }
+                break;
             }
         }
     }

src/rt/backtrace/dwarf.d

@@ -31,7 +31,7 @@ else
     import rt.backtrace.elf;
 
 import rt.util.container.array;
-import core.stdc.string : strlen, memchr, memcpy;
+import core.stdc.string : strlen, memcpy;
 
 //debug = DwarfDebugMachine;
 debug(DwarfDebugMachine) import core.stdc.stdio : printf;
@@ -348,10 +348,11 @@ bool runStateMachine(ref const(LineNumberProgram) lp, scope RunStateMachineCallb
     return true;
 }
 
-const(char)[] getDemangledSymbol(const(char)[] btSymbol, ref char[1024] buffer)
+const(char)[] getDemangledSymbol(const(char)[] btSymbol, return ref char[1024] buffer)
 {
     import core.demangle;
-    return demangle(getMangledSymbolName(btSymbol), buffer[]);
+    const mangledName = getMangledSymbolName(btSymbol);
+    return !mangledName.length ? buffer[0..0] : demangle(mangledName, buffer[]);
 }
 
 T read(T)(ref const(ubyte)[] buffer) @nogc nothrow