paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-22 14:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ systems_garbage_collected_managed_types set in systems.pas

Browse Source 
* don't call special helpers to assign refcounted types for
    systems_garbage_collected_managed_types

git-svn-id: branches/jvmbackend@18412 -
This commit is contained in:
Jonas Maebe 2011-08-20 07:57:31 +00:00
parent 87048f0cc8
commit 14e4f3459c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/nld.pas
View File

@ -717,7 +717,8 @@ implementation
else if is_managed_type(left.resultdef) and
(left.resultdef.typ in [arraydef,objectdef,recorddef]) and
not is_interfacecom_or_dispinterface(left.resultdef) and
not is_dynamic_array(left.resultdef) then
not is_dynamic_array(left.resultdef) and
not(target_info.system in systems_garbage_collected_managed_types) then
begin
hp:=ccallparanode.create(caddrnode.create_internal(
crttinode.create(tstoreddef(left.resultdef),initrtti,rdt_normal)),
@ -734,7 +735,8 @@ implementation
end
{ call helpers for variant, they can contain non ref. counted types like
vararrays which must be really copied }
else if left.resultdef.typ=variantdef then
else if (left.resultdef.typ=variantdef) and
not(target_info.system in systems_garbage_collected_managed_types) then
begin
hp:=ccallparanode.create(ctypeconvnode.create_internal(
caddrnode.create_internal(right),voidpointertype),

5
compiler/systems.pas
View File

@ -301,6 +301,11 @@ interface
system_x86_64_freebsd,
system_x86_64_solaris];
{ all systems that use garbage collection for reference-counted types }
systems_garbage_collected_managed_types = [
system_jvm_java32
];
cpu2str : array[TSystemCpu] of string[10] =
('','i386','m68k','alpha','powerpc','sparc','vm','ia64','x86_64',
'mips','arm', 'powerpc64', 'avr', 'mipsel','jvm');