فهرست منبع

* no longer store the tprocdef.synthetickind field in ppu files

git-svn-id: trunk@34130 -
Jonas Maebe 9 سال پیش
والد
کامیت
6558d7a521
3فایلهای تغییر یافته به همراه4 افزوده شده و 27 حذف شده
  1. 1 1
      compiler/ppu.pas
  2. 3 5
      compiler/symdef.pas
  3. 0 21
      compiler/utils/ppuutils/ppudump.pp

+ 1 - 1
compiler/ppu.pas

@@ -43,7 +43,7 @@ type
 {$endif Test_Double_checksum}
 
 const
-  CurrentPPUVersion = 183;
+  CurrentPPUVersion = 184;
 
   ppubufsize   = 16384;
 

+ 3 - 5
compiler/symdef.pas

@@ -777,10 +777,10 @@ interface
 {$endif oldregvars}
           import_nr    : word;
           extnumber    : word;
-          visibility   : tvisibility;
           { set to a value different from tsk_none in case this procdef is for
             a routine that has to be internally generated by the compiler }
-          synthetickind : tsynthetickind;
+          synthetickind: tsynthetickind;
+          visibility   : tvisibility;
           constructor create(level:byte;doregister:boolean);virtual;
           constructor ppuload(ppufile:tcompilerppufile);
           destructor  destroy;override;
@@ -5424,7 +5424,6 @@ implementation
            deprecatedmsg:=stringdup(ppufile.getstring)
          else
            deprecatedmsg:=nil;
-         synthetickind:=tsynthetickind(ppufile.getbyte);
          { import stuff }
          if po_has_importdll in procoptions then
            import_dll:=stringdup(ppufile.getstring)
@@ -5596,7 +5595,6 @@ implementation
          ppufile.putsmallset(symoptions);
          if sp_has_deprecated_msg in symoptions then
            ppufile.putstring(deprecatedmsg^);
-         ppufile.putbyte(byte(synthetickind));
          { import }
          if po_has_importdll in procoptions then
            ppufile.putstring(import_dll^);
@@ -5875,6 +5873,7 @@ implementation
           begin
             if assigned(resultname) then
               tprocdef(result).resultname:=stringdup(resultname^);
+            tprocdef(result).synthetickind:=synthetickind;
           end;
         if assigned(import_dll) then
           tprocdef(result).import_dll:=stringdup(import_dll^);
@@ -5883,7 +5882,6 @@ implementation
         tprocdef(result).import_nr:=import_nr;
         tprocdef(result).extnumber:=$ffff;
         tprocdef(result).visibility:=visibility;
-        tprocdef(result).synthetickind:=synthetickind;
         { we need a separate implementation for the copied def }
         tprocdef(result).forwarddef:=true;
         tprocdef(result).interfacedef:=true;

+ 0 - 21
compiler/utils/ppuutils/ppudump.pp

@@ -530,26 +530,6 @@ begin
 end;
 
 
-Function Synthetic2Str(w: byte): string;
-const
-   syntheticName : array[tsynthetickind] of string[length('jvm procvar intf constructor')] = (
-      '<none>','anon inherited','jvm clone','record deep copy',
-      'record initilializer', 'empty routine', 'typed const initializer',
-      'callthough', 'callthrough if not abstract', 'jvm enum values',
-      'jvm enum valueof', 'jvm enum class constructor',
-      'jvm enum jumps constructor', 'jvm enum fpcordinal',
-      'jvm enum fpcvalueof', 'jvm enum long2set',
-      'jvm enum bitset2set', 'jvm enum set2set',
-      'jvm procvar invoke', 'jvm procvar intf constructor',
-      'jvm virtual class method', 'jvm field getter', 'jvm field setter',
-      'block invoke','interface wrapper','call parameterless routine');
-begin
-  if w<=ord(high(syntheticName)) then
-    result:=syntheticName[tsynthetickind(w)]
-  else
-    result:=Unknown('synthetickind',w);
-end;
-
 function PPUFlags2Str(flags:longint):string;
 type
   tflagopt=record
@@ -3032,7 +3012,6 @@ begin
              readvisibility(def);
              write  ([space,'       SymOptions : ']);
              readsymoptions(space+'       ');
-             writeln  ([space,'   Synthetic kind : ',Synthetic2Str(ppufile.getbyte)]);
              if (po_has_importdll in procoptions) then
                writeln([space,'      Import DLL : ',getstring]);
              if (po_has_importname in procoptions) then