summaryrefslogtreecommitdiff
path: root/compiler/nadd.pas
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-05-01 20:50:18 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-05-01 20:50:18 +0000
commitcda8474cdfd73a0194b9a784ff2c390490f5a898 (patch)
treed4926b9bc679282675ac3d6a19d19a7c8ba05a11 /compiler/nadd.pas
parent257ec83a793d6d94428de836debbcf50f2c92081 (diff)
downloadfpc-cda8474cdfd73a0194b9a784ff2c390490f5a898.tar.gz
* GetCopyAndTypeCheck forces correct type
* propagate forinline flag through simplify git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@45213 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/nadd.pas')
-rw-r--r--compiler/nadd.pas3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/nadd.pas b/compiler/nadd.pas
index bb91cc2029..b900063f71 100644
--- a/compiler/nadd.pas
+++ b/compiler/nadd.pas
@@ -484,6 +484,7 @@ implementation
begin
result:=getcopy;
result.resultdef:=nil;
+ result:=ctypeconvnode.create_internal(result,resultdef);
do_typecheckpass(result);
end;
@@ -783,7 +784,7 @@ implementation
{ keep the order of val+const else pointer operations might cause an error }
hp:=taddnode(left).left;
taddnode(left).left:=right;
- left:=left.simplify(false);
+ left:=left.simplify(forinline);
right:=left;
left:=hp;
result:=GetCopyAndTypeCheck;