From af9934cb6cde5420aecad8122874ffcd03a04b9f Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sun, 11 Dec 2011 17:26:14 +0000 Subject: [PATCH] * make sure that integers converted to widechar are always processed by an i2c instruction for Dalvik verification purposes git-svn-id: branches/jvmbackend@19826 - --- compiler/jvm/njvmcnv.pas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/jvm/njvmcnv.pas b/compiler/jvm/njvmcnv.pas index cb9d57f4c1..cfb9f49f2a 100644 --- a/compiler/jvm/njvmcnv.pas +++ b/compiler/jvm/njvmcnv.pas @@ -550,8 +550,9 @@ implementation end else begin - if (ressize < sizeof(aint)) and - (def_cgsize(left.resultdef)<>def_cgsize(resultdef)) then + if ((ressize < sizeof(aint)) and + (def_cgsize(left.resultdef)<>def_cgsize(resultdef))) or + (is_widechar(left.resultdef)<>is_widechar(resultdef)) then begin location_reset(location,LOC_REGISTER,def_cgsize(resultdef)); location.register:=hlcg.getintregister(current_asmdata.CurrAsmList,resultdef);