* backported fix for 4277

  * typedconsts are always written to datasegment
    to prevent mixing arrayindexes with string data

git-svn-id: branches/fixes_2_0@900 -

.gitattributes

@@ -5999,6 +5999,7 @@ tests/webtbs/tw4240.pp svneol=native#text/plain
 tests/webtbs/tw4247.pp svneol=native#text/plain
 tests/webtbs/tw4253.pp svneol=native#text/plain
 tests/webtbs/tw4260.pp svneol=native#text/plain
+tests/webtbs/tw4277.pp svneol=native#text/plain
 tests/webtbs/ub1873.pp svneol=native#text/plain
 tests/webtbs/ub1883.pp svneol=native#text/plain
 tests/webtbs/uw0555.pp svneol=native#text/plain

compiler/ncgutil.pas

@@ -103,7 +103,6 @@ interface
     procedure new_exception(list:TAAsmoutput;const t:texceptiontemps;exceptlabel:tasmlabel);
     procedure free_exception(list:TAAsmoutput;const t:texceptiontemps;a:aint;endexceptlabel:tasmlabel;onlyfree:boolean);
 
-    procedure insertconstdata(sym : ttypedconstsym);
     procedure insertbssdata(sym : tglobalvarsym);
 
     procedure gen_alloc_symtable(list:TAAsmoutput;st:tsymtable);
@@ -1905,42 +1904,6 @@ implementation
                                Const Data
 ****************************************************************************}
 
-    procedure insertconstdata(sym : ttypedconstsym);
-    { this does not affect the local stack space, since all
-      typed constansts and initialized variables are always
-      put in the .data / .rodata section
-    }
-      var
-        storefilepos : tfileposinfo;
-        curconstsegment : taasmoutput;
-        l : longint;
-      begin
-        storefilepos:=aktfilepos;
-        aktfilepos:=sym.fileinfo;
-        if sym.is_writable then
-          curconstsegment:=datasegment
-        else
-          curconstsegment:=consts;
-        l:=sym.getsize;
-        { insert cut for smartlinking or alignment }
-        maybe_new_object_file(curconstSegment);
-        new_section(curconstSegment,sec_rodata,lower(sym.mangledname),const_align(l));
-{$ifdef GDB}
-        if (cs_debuginfo in aktmoduleswitches) then
-          sym.concatstabto(curconstSegment);
-{$endif GDB}
-        if (sym.owner.symtabletype=globalsymtable) or
-           maybe_smartlink_symbol or
-           (assigned(current_procinfo) and
-            (po_inline in current_procinfo.procdef.procoptions)) or
-           DLLSource then
-          curconstSegment.concat(Tai_symbol.Createname_global(sym.mangledname,AT_DATA,l))
-        else
-          curconstSegment.concat(Tai_symbol.Createname(sym.mangledname,AT_DATA,l));
-        aktfilepos:=storefilepos;
-      end;
-
-
     procedure insertbssdata(sym : tglobalvarsym);
       var
         l,varalign : longint;

compiler/pdecl.pas

@@ -204,7 +204,6 @@ implementation
                    sym:=ttypedconstsym.createtype(orgname,tt,(cs_typed_const_writable in aktlocalswitches));
                    akttokenpos:=storetokenpos;
                    symtablestack.insert(sym);
-                   insertconstdata(ttypedconstsym(sym));
                    { procvar can have proc directives, but not type references }
                    if (tt.def.deftype=procvardef) and
                       (tt.sym=nil) then

compiler/pdecvar.pas

@@ -649,7 +649,6 @@ implementation
               tcsym:=ttypedconstsym.createtype('default'+vs.realname,tt,false);
               vs.defaultconstsym:=tcsym;
               symtablestack.insert(tcsym);
-              insertconstdata(tcsym);
               readtypedconst(tt,tcsym,false);
               { The variable has a value assigned }
               vs.varstate:=vs_assigned;
@@ -660,7 +659,6 @@ implementation
               tcsym.fileinfo:=vs.fileinfo;
               symtablestack.replace(vs,tcsym);
               vs.free;
-              insertconstdata(tcsym);
               consume(_EQUAL);
               readtypedconst(tt,tcsym,true);
             end;

compiler/ptconst.pas

@@ -41,7 +41,7 @@ implementation
        symconst,symbase,symdef,symtable,
        aasmbase,aasmtai,aasmcpu,defutil,defcmp,
        { pass 1 }
-       node,htypechk,
+       node,htypechk,procinfo,
        nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw,
        { parser specific stuff }
        pbase,pexpr,
@@ -82,6 +82,7 @@ implementation
          pw        : pcompilerwidestring;
          error     : boolean;
          old_block_type : tblock_type;
+         storefilepos : tfileposinfo;
 
          procedure check_range(def:torddef);
          begin
@@ -98,10 +99,34 @@ implementation
       begin
          old_block_type:=block_type;
          block_type:=bt_const;
-         if writable then
-           curconstsegment:=datasegment
-         else
-           curconstsegment:=consts;
+
+         { put everything in the datasemgent to prevent
+           mixing array indexes with ansistring data }
+         curconstsegment:=datasegment;
+
+         if assigned(sym) then
+           begin
+             storefilepos:=aktfilepos;
+             aktfilepos:=sym.fileinfo;
+             l:=sym.getsize;
+             { insert cut for smartlinking or alignment }
+             maybe_new_object_file(curconstSegment);
+             new_section(curconstSegment,sec_rodata,lower(sym.mangledname),const_align(l));
+     {$ifdef GDB}
+             if (cs_debuginfo in aktmoduleswitches) then
+               sym.concatstabto(curconstSegment);
+     {$endif GDB}
+             if (sym.owner.symtabletype=globalsymtable) or
+                maybe_smartlink_symbol or
+                (assigned(current_procinfo) and
+                 (po_inline in current_procinfo.procdef.procoptions)) or
+                DLLSource then
+               curconstSegment.concat(Tai_symbol.Createname_global(sym.mangledname,AT_DATA,l))
+             else
+               curconstSegment.concat(Tai_symbol.Createname(sym.mangledname,AT_DATA,l));
+             aktfilepos:=storefilepos;
+           end;
+
          case t.def.deftype of
             orddef:
               begin

tests/webtbs/tw4277.pp

@@ -0,0 +1,11 @@
+{$mode delphi}
+{$J-}
+
+const
+  RFCMonthNames : Array[1..12] of String = (
+    'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
+
+begin
+  writeln(RFCMonthNames[10]);
+end.