* correctly set expectloc for bool->cbool type conversions (mantis #22502)

git-svn-id: trunk@21973 -

.gitattributes

@@ -12682,6 +12682,7 @@ tests/webtbs/tw22331.pp svneol=native#text/plain
 tests/webtbs/tw22344.pp svneol=native#text/plain
 tests/webtbs/tw2242.pp svneol=native#text/plain
 tests/webtbs/tw2250.pp svneol=native#text/plain
+tests/webtbs/tw22502.pp svneol=native#text/plain
 tests/webtbs/tw2259.pp svneol=native#text/plain
 tests/webtbs/tw2260.pp svneol=native#text/plain
 tests/webtbs/tw2266.pp svneol=native#text/plain

compiler/ncnv.pas

@@ -3078,7 +3078,8 @@ implementation
     function ttypeconvnode.first_bool_to_bool : tnode;
       begin
          first_bool_to_bool:=nil;
-         if (left.expectloc in [LOC_FLAGS,LOC_JUMP]) then
+         if (left.expectloc in [LOC_FLAGS,LOC_JUMP]) and
+            not is_cbool(resultdef) then
            expectloc := left.expectloc
          else
            expectloc:=LOC_REGISTER;

tests/webtbs/tw22502.pp

@@ -0,0 +1,9 @@
+var
+  b: Boolean;
+begin
+ b:=true;
+ b := longbool(b = b);
+ if not b then
+   halt(1);
+end.
+