* only consider tc_pointer_to_array typeconversions to determine whether a

    pointer->array type conversion implies an implicit dereference operation
    (mantis #25622)

git-svn-id: trunk@26608 -

.gitattributes

@@ -12637,6 +12637,8 @@ tests/webtbf/tw25215.pp svneol=native#text/pascal
 tests/webtbf/tw25318.pp svneol=native#text/pascal
 tests/webtbf/tw25504.pp svneol=native#text/plain
 tests/webtbf/tw2562.pp svneol=native#text/plain
+tests/webtbf/tw25622.pp svneol=native#text/plain
+tests/webtbf/tw25622a.pp svneol=native#text/plain
 tests/webtbf/tw2657.pp svneol=native#text/plain
 tests/webtbf/tw2670.pp svneol=native#text/plain
 tests/webtbf/tw2719.pp svneol=native#text/plain

compiler/htypechk.pas

@@ -1512,8 +1512,8 @@ implementation
                      begin
                        { pointer -> array conversion is done then we need to see it
                          as a deref, because a ^ is then not required anymore }
-                       if (ttypeconvnode(hp).left.resultdef.typ=pointerdef) then
-                        gotderef:=true;
+                       if ttypeconvnode(hp).convtype=tc_pointer_2_array then
+                         gotderef:=true;
                      end;
                  end;
                  hp:=ttypeconvnode(hp).left;

tests/webtbf/tw25622.pp

@@ -0,0 +1,23 @@
+{ %fail }
+
+{$mode delphi}
+
+program test;
+
+type
+   TDynamicArray = array of record end; // or array of whatever
+   PDynamicArray = ^TDynamicArray;
+
+function TestA(): Pointer;
+begin
+   Result := nil;
+end;
+
+function TestB(): PDynamicArray;
+begin
+   // can't take address of function return value, but compiler instead says "Internal error 2006111510"
+   Result := @TDynamicArray(TestA());
+end;
+
+begin
+end.

tests/webtbf/tw25622a.pp

@@ -0,0 +1,23 @@
+{ %fail }
+
+{$mode delphi}
+
+program test;
+
+type
+   PArray = ^TArray;
+   TArray = array[1..sizeof(ptrint)] of byte;
+
+function TestA(): Pointer;
+begin
+   Result := nil;
+end;
+
+function TestB(): PArray;
+begin
+   // can't take address of function return value, but compiler instead says "Internal error 2006111510"
+   Result := @TArray(TestA());
+end;
+
+begin
+end.