|
@@ -296,7 +296,7 @@ unit typinfo;
|
|
record
|
|
record
|
|
private
|
|
private
|
|
function GetParam(Index: Word): PVmtMethodParam;
|
|
function GetParam(Index: Word): PVmtMethodParam;
|
|
- function GetReturnLoc: PParameterLocations; inline;
|
|
|
|
|
|
+ function GetResultLocs: PParameterLocations; inline;
|
|
function GetTail: Pointer; inline;
|
|
function GetTail: Pointer; inline;
|
|
function GetNext: PIntfMethodEntry; inline;
|
|
function GetNext: PIntfMethodEntry; inline;
|
|
public
|
|
public
|
|
@@ -307,9 +307,9 @@ unit typinfo;
|
|
StackSize: SizeInt;
|
|
StackSize: SizeInt;
|
|
Name: ShortString;
|
|
Name: ShortString;
|
|
{ Params: array[0..ParamCount - 1] of TVmtMethodParam }
|
|
{ Params: array[0..ParamCount - 1] of TVmtMethodParam }
|
|
- { ReturnLoc: TParameterLocations (if ResultType != Nil) }
|
|
|
|
|
|
+ { ResultLocs: TParameterLocations (if ResultType != Nil) }
|
|
property Param[Index: Word]: PVmtMethodParam read GetParam;
|
|
property Param[Index: Word]: PVmtMethodParam read GetParam;
|
|
- property ReturnLoc: PParameterLocations read GetReturnLoc;
|
|
|
|
|
|
+ property ResultLocs: PParameterLocations read GetResultLocs;
|
|
property Tail: Pointer read GetTail;
|
|
property Tail: Pointer read GetTail;
|
|
property Next: PIntfMethodEntry read GetNext;
|
|
property Next: PIntfMethodEntry read GetNext;
|
|
end;
|
|
end;
|
|
@@ -2611,7 +2611,7 @@ begin
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
|
|
|
|
-function TIntfMethodEntry.GetReturnLoc: PParameterLocations;
|
|
|
|
|
|
+function TIntfMethodEntry.GetResultLocs: PParameterLocations;
|
|
begin
|
|
begin
|
|
if not Assigned(ResultType) then
|
|
if not Assigned(ResultType) then
|
|
Result := Nil
|
|
Result := Nil
|
|
@@ -2627,7 +2627,7 @@ var
|
|
begin
|
|
begin
|
|
if Assigned(ResultType) then
|
|
if Assigned(ResultType) then
|
|
begin
|
|
begin
|
|
- retloc := ReturnLoc;
|
|
|
|
|
|
+ retloc := ResultLocs;
|
|
Result := PByte(@retloc^.Count) + SizeOf(retloc^.Count) + SizeOf(TParameterLocation) * retloc^.Count;
|
|
Result := PByte(@retloc^.Count) + SizeOf(retloc^.Count) + SizeOf(TParameterLocation) * retloc^.Count;
|
|
end
|
|
end
|
|
else if ParamCount = 0 then
|
|
else if ParamCount = 0 then
|