* since the generic second_bool_to_bool() calls through to

    second_int_to_bool() and second_bool_to_int() for certain cases, do the
    same for their first_*() variants in first_bool_to_bool() so that the
    expectloc is correctly initialised
   o since first_int_to_bool can now be called for bool_to_bool to, make
     sure we correctly handle is_boolean(left.resultdef) in that case
     (integers cast to a smaller boolean type ignore the upper bits,
      while with boolean to boolean they are taken into account

git-svn-id: branches/hlcgllvm@28369 -

compiler/ncnv.pas

@@ -3076,7 +3076,14 @@ implementation
            end;
          { when converting 64bit int to C-ctyle boolean, first convert to an int32 and then }
          { convert to a boolean (only necessary for 32bit processors) }
-         if (left.resultdef.size > sizeof(aint)) and (left.resultdef.size<>resultdef.size)
+         { note: not if left is already a bool (qwordbool that is true, even if
+             only because the highest bit is set, must remain true if it is
+             --implicitly, unlike integers-- converted to another type of bool),
+             Left can already be a bool because this routine can also be called
+             from first_bool_to_bool }
+         if not is_boolean(left.resultdef) and
+            (left.resultdef.size > sizeof(aint)) and
+            (left.resultdef.size<>resultdef.size)
             and is_cbool(resultdef) then
            begin
              left:=ctypeconvnode.create_internal(left,s32inttype);
@@ -3093,8 +3100,13 @@ implementation
          if (left.expectloc in [LOC_FLAGS,LOC_JUMP]) and
             not is_cbool(resultdef) then
            expectloc := left.expectloc
+         { the following cases use the code generation for bool_to_int/
+           int_to_bool -> also set their expectlocs }
+         else if (resultdef.size=left.resultdef.size) and
+            (is_cbool(resultdef)=is_cbool(left.resultdef)) then
+           result:=first_bool_to_int
          else
-           expectloc:=LOC_REGISTER;
+           result:=first_int_to_bool
       end;