浏览代码

compier, rtl: revert 24424 since it fails on some platforms

git-svn-id: trunk@24425 -
paul 12 年之前
父节点
当前提交
d18f273f67
共有 3 个文件被更改,包括 2 次插入17 次删除
  1. 1 1
      compiler/ncgrtti.pas
  2. 1 1
      rtl/inc/rtti.inc
  3. 0 15
      rtl/objpas/typinfo.pp

+ 1 - 1
compiler/ncgrtti.pas

@@ -175,7 +175,7 @@ implementation
                not is_objc_class_or_protocol(tfieldvarsym(sym).vardef) then
               begin
                 current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_sym(ref_rtti(tfieldvarsym(sym).vardef,rt)));
-                current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_pint(tfieldvarsym(sym).fieldoffset));
+                current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_32bit(tfieldvarsym(sym).fieldoffset));
                 inc(fieldcnt);
               end;
           end;

+ 1 - 1
rtl/inc/rtti.inc

@@ -20,7 +20,7 @@ type
   PRecordElement=^TRecordElement;
   TRecordElement=packed record
     TypeInfo: Pointer;
-    Offset: PtrInt;
+    Offset: Longint;
   end;
 
   PRecordInfo=^TRecordInfo;

+ 0 - 15
rtl/objpas/typinfo.pp

@@ -152,12 +152,6 @@ unit typinfo;
                UnitName : ShortString
                // here the properties follow as array of TPropInfo
               );
-            tkRecord:
-              (
-                RecSize: Integer;
-                ManagedFldCount: Integer;
-                {ManagedFields: array[1..ManagedFldCount] of TManagedField}
-              );
             tkHelper:
               (HelperParent : PTypeInfo;
                ExtendedInfo : PTypeInfo;
@@ -219,14 +213,6 @@ unit typinfo;
       end;
 
       // unsed, just for completeness
-      TManagedField =
-      {$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
-      packed
-      {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
-      record
-        TypeRef: PTypeInfo;
-        FldOffset: PtrInt;
-      end;
       TPropData =
 {$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
       packed
@@ -263,7 +249,6 @@ unit typinfo;
       TPropList = array[0..65535] of PPropInfo;
 
    const
-      tkProcedure = tkProcVar; // for compatibility with Delphi
       tkAny = [Low(TTypeKind)..High(TTypeKind)];
       tkMethods = [tkMethod];
       tkProperties = tkAny-tkMethods-[tkUnknown];