* 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

@@ -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);