paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-11 10:58:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* make sure that int->int conversions are handled by the generic code

Browse Source 
* handle class->interface conversions by JVM-specific code

git-svn-id: branches/jvmbackend@18655 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:21:44 +00:00
parent 67ce687683
commit 625f52b7e4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/jvm/njvmcnv.pas
View File

@ -673,7 +673,10 @@ implementation
toarrtype: char;
begin
resnode:=nil;
if not(convtype in [tc_equal,tc_int_2_int,tc_int_2_bool,tc_bool_2_int]) then
if not(convtype in [tc_equal,tc_int_2_int,tc_int_2_bool,tc_bool_2_int,tc_class_2_intf]) or
((convtype in [tc_equal,tc_int_2_int,tc_bool_2_int,tc_int_2_bool]) and
((left.resultdef.typ=orddef) and
(resultdef.typ=orddef))) then
begin
result:=false;
exit