mostly fixing cpp_mangle

Author: WalterBright

dm/src/dmc/cgobj.d

@@ -95,11 +95,6 @@ struct Loc
 
 void error(Loc loc, const(char)* format, ...);
 
-version (MARS)
-{
-// C++ name mangling is handled by front end
-const(char)* cpp_mangle(Symbol* s) { return &s.Sident[0]; }
-}
 
 }
 
@@ -2402,9 +2397,9 @@ size_t OmfObj_mangle(Symbol *s,char *dest)
 
     //printf("OmfObj_mangle('%s'), mangle = x%x\n",s.Sident.ptr,type_mangle(s.Stype));
 version (SCPP)
-    name = CPP ? cpp_mangle(s) : s.Sident.ptr;
+    name = CPP ? cpp_mangle(s) : &s.Sident[0];
 else version (MARS)
-    name = cast(char*)cpp_mangle(s);
+    name = &s.Sident[0];
 else
     static assert(0);
 
@@ -2647,7 +2642,7 @@ void OmfObj_pubdef(int seg,Symbol *s,targ_size_t offset)
     char* p;
     uint ti;
 
-    assert(offset < 100000000);
+    assert(offset < 100_000_000);
     obj.resetSymbols.push(s);
 
     int idx = SegData[seg].segidx;

dm/src/dmc/dexp2.d

@@ -70,7 +70,11 @@ __gshared list_t symlist;                  // for C
 extern __gshared ubyte[TYMAX] _tyrelax;
 uint type_relax() { return config.flags3 & CFG3relax; }     // !=0 if relaxed type checking
 
-uint type_semirelax() { return config.flags3 & CFG3semirelax; } // !=0 if semi-relaxed type checking
+// !=0 if semi-relaxed type checking
+uint type_semirelax()
+{
+    return config.exe & EX_posix ? (config.flags3 & CFG3semirelax) : type_relax();
+}
 
 int REGSIZE() { return _tysize[TYnptr]; }
 

dm/src/dmc/elfobj.d

@@ -66,11 +66,12 @@ enum DEST_LEN = (IDMAX + IDOHD + 1);
 char *obj_mangle2(Symbol *s,char *dest, size_t *destlen);
 
 version (MARS)
-// C++ name mangling is handled by front end
-const(char)* cpp_mangle2(Symbol* s) { return s.Sident.ptr; }
+{
+    // C++ name mangling is handled by front end
+    const(char)* cpp_mangle2(Symbol* s) { return &s.Sident[0]; }
+}
 else
-const(char)* cpp_mangle2(Symbol* s) { return cpp_mangle(s); }
-
+    const(char)* cpp_mangle2(Symbol* s) { return cpp_mangle(s); }
 
 void addSegmentToComdat(segidx_t seg, segidx_t comdatseg);
 

dm/src/dmc/func.d

@@ -447,8 +447,12 @@ void func_body(Symbol *s)
                             break;
 
                         default:
+printf("test1 %d\n", config.flags3 & CFG3relax);
+type_print(p.Ptype);
+type_print(pproto.Ptype);
                             break;
                     }
+printf("test2\n");
                     typerr(EM_nomatch_proto,p.Ptype,pproto.Ptype,&sp.Sident[0]);
                 typeok: ;
                 }

dm/src/dmc/global.d

@@ -103,12 +103,7 @@ else
 Symbol *asm_define_label(const(char)* id);
 
 // cpp.c
-version (SCPP)
-    const(char)* cpp_mangle(Symbol* s);
-else version (MARS)
-    const(char)* cpp_mangle(Symbol* s);
-else
-    const(char)* cpp_mangle(Symbol* s) { return &s.Sident[0]; }
+const(char)* cpp_mangle(Symbol* s);
 
 // ee.c
 void eecontext_convs(SYMIDX marksi);

dm/src/dmc/machobj.d

@@ -2188,23 +2188,23 @@ char *unsstr (uint value)
 char *obj_mangle2(Symbol *s,char *dest)
 {
     size_t len;
-    char *name;
+    const(char)* name;
 
     //printf("Obj_mangle(s = %p, '%s'), mangle = x%x\n",s,s.Sident.ptr,type_mangle(s.Stype));
     symbol_debug(s);
     assert(dest);
 version (SCPP)
 {
-    name = CPP ? cpp_mangle(s) : s.Sident.ptr;
+    name = CPP ? cpp_mangle(s) : &s.Sident[0];
 }
 else version (MARS)
 {
     // C++ name mangling is handled by front end
-    name = s.Sident.ptr;
+    name = &s.Sident[0];
 }
 else
 {
-    name = s.Sident.ptr;
+    name = &s.Sident[0];
 }
     len = strlen(name);                 // # of bytes in name
     //dbg_printf("len %d\n",len);

dm/src/dmc/mscoffobj.d

@@ -1785,12 +1785,12 @@ char *obj_mangle2(Symbol *s,char *dest)
     assert(dest);
 
 version (SCPP)
-    name = CPP ? cpp_mangle(s) : s.Sident.ptr;
+    name = CPP ? cpp_mangle(s) : &s.Sident[0];
 else version (MARS)
     // C++ name mangling is handled by front end
-    name = s.Sident.ptr;
+    name = &s.Sident[0];
 else
-    name = s.Sident.ptr;
+    name = &s.Sident[0];
 
     len = strlen(name);                 // # of bytes in name
     //dbg_printf("len %d\n",len);

dm/src/dmc/newman.d

@@ -511,6 +511,10 @@ char *cpp_typetostring(type *t,char *prefix)
 
 version (HTOD)
 {
+const(char) *cpp_mangle(Symbol *s)
+{
+    return symbol_ident(s);
+}
 }
 else
 {

dm/src/dmc/out.d

@@ -1411,16 +1411,9 @@ version (SCPP)
         else if (config.flags & CFGsegs) // if user set switch for this
         {
             version (SCPP)
-            {
-                objmod.codeseg(cast(char*)cpp_mangle(funcsym_p),1);
-            }
+                objmod.codeseg(cpp_mangle(funcsym_p),1);
             else
-            {
-                if (config.exe & EX_windos)
-                    objmod.codeseg(cast(char*)cpp_mangle(funcsym_p),1);
-                else
-                    objmod.codeseg(cast(char*)funcsym_p.Sident.ptr, 1);
-            }
+                objmod.codeseg(&funcsym_p.Sident[0], 1);
                                         // generate new code segment
         }
         cod3_align(cseg);               // align start of function