aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2022-01-16 14:09:20 +0100
committerPierre-Marie de Rodat <derodat@adacore.com>2022-05-19 14:05:32 +0000
commit8630f50feeb78d4a69eaeabf520b734a67bfe32b (patch)
tree503ee06455cc1d6cca648adac3e381fd0548451c /gcc
parent0d9583573b7fbb4ee3fc769f962dfdde8684d795 (diff)
downloadgcc-8630f50feeb78d4a69eaeabf520b734a67bfe32b.zip
gcc-8630f50feeb78d4a69eaeabf520b734a67bfe32b.tar.gz
gcc-8630f50feeb78d4a69eaeabf520b734a67bfe32b.tar.bz2
[Ada] Preserve unchecked conversion of string constant
This makes it possible to pass the result to a C function directly. gcc/ada/ * gcc-interface/utils.cc (unchecked_convert): Do not fold a string constant if the target type is pointer to character.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/gcc-interface/utils.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc
index 5722ed2..98bcb70 100644
--- a/gcc/ada/gcc-interface/utils.cc
+++ b/gcc/ada/gcc-interface/utils.cc
@@ -5637,6 +5637,13 @@ unchecked_convert (tree type, tree expr, bool notrunc_p)
return unchecked_convert (type, expr, notrunc_p);
}
+ /* If we are converting a string constant to a pointer to character, make
+ sure that the string is not folded into an integer constant. */
+ else if (TREE_CODE (expr) == STRING_CST
+ && POINTER_TYPE_P (type)
+ && TYPE_STRING_FLAG (TREE_TYPE (type)))
+ expr = build1 (VIEW_CONVERT_EXPR, type, expr);
+
/* Otherwise, just build a VIEW_CONVERT_EXPR of the expression. */
else
{