summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-08-19 13:47:50 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-08-19 13:47:50 +0000
commit7679a3ab2f2088022aec102e2a6de858f30a9082 (patch)
tree32326230820cc8f3ae5ab8b1ee0794d5f08f1754
parent17b27dafc74cca9afa92dddc8f6d02c73f3fd8bc (diff)
downloadfpc-7679a3ab2f2088022aec102e2a6de858f30a9082.tar.gz
* fixed writing jvm type for string constants after r22020
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22123 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--compiler/jvm/jvmdef.pas3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/jvm/jvmdef.pas b/compiler/jvm/jvmdef.pas
index ae56941128..e028e6769b 100644
--- a/compiler/jvm/jvmdef.pas
+++ b/compiler/jvm/jvmdef.pas
@@ -929,7 +929,8 @@ implementation
begin
csym:=tconstsym(sym);
{ some constants can be untyped }
- if assigned (csym.constdef) then
+ if assigned(csym.constdef) and
+ not(csym.consttyp in [constwstring,conststring]) then
begin
result:=jvmencodetype(csym.constdef,false);
if withsignature and