[llvm-branch-commits] [clang] Convert to exec-charset inside getPredefinedStringLiteralFromCache (PR #196569)
Abhina Sree via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Nov 2 10:58:25 PST 2026
https://github.com/abhina-sree updated https://github.com/llvm/llvm-project/pull/196569
>From d342a1a6f7c79791ed5f12e615073815f9cea53f Mon Sep 17 00:00:00 2001
From: Abhina Sreeskantharajan <Abhina.Sreeskantharajan at ibm.com>
Date: Fri, 8 May 2026 12:20:45 -0400
Subject: [PATCH 1/2] convert to exec-charset inside
getPredefinedStringLiteralFromCache, test __builtin_FILE()
---
clang/include/clang/Basic/TargetInfo.h | 2 ++
clang/lib/AST/ASTContext.cpp | 10 ++++++++++
clang/lib/Basic/TargetInfo.cpp | 3 +++
clang/lib/Lex/TextEncoding.cpp | 3 ++-
clang/test/CodeGen/systemz-charset.cpp | 4 +++-
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h
index a6523e8eaaa437..ffef88154a00ca 100644
--- a/clang/include/clang/Basic/TargetInfo.h
+++ b/clang/include/clang/Basic/TargetInfo.h
@@ -330,6 +330,8 @@ class TargetInfo : public TransferrableTargetInfo,
virtual ~TargetInfo();
+ llvm::TextEncodingConverter *ExecStrConverter;
+
/// Retrieve the target options.
TargetOptions &getTargetOpts() const {
assert(TargetOpts && "Missing target options");
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 8037085e6d5854..ce0d1a0c9d267a 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -13957,6 +13957,16 @@ ASTContext::getPredefinedStringLiteralFromCache(StringRef Key) const {
*this, Key, StringLiteralKind::Ordinary,
/*Pascal*/ false, getStringLiteralArrayType(CharTy, Key.size()),
SourceLocation());
+
+ llvm::TextEncodingConverter *Converter = getTargetInfo().ExecStrConverter;
+ if (Converter) {
+ SmallString<128> Converted;
+ Converter->convert(Result->getString(), Converted);
+ Result = StringLiteral::Create(
+ *this, Converted, StringLiteralKind::Ordinary, /*Pascal*/ false,
+ getStringLiteralArrayType(CharTy, Converted.size()), SourceLocation());
+ }
+
return Result;
}
diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
index 6e390226d2e4b8..fb08d71ec8595f 100644
--- a/clang/lib/Basic/TargetInfo.cpp
+++ b/clang/lib/Basic/TargetInfo.cpp
@@ -201,6 +201,9 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : Triple(T) {
MaxOpenCLWorkGroupSize = 1024;
MaxBitIntWidth.reset();
+
+ ExecStrConverter = new llvm::TextEncodingConverter(
+ std::move(*llvm::TextEncodingConverter::createNoopConverter()));
}
// Out of line virtual dtor for TargetInfo.
diff --git a/clang/lib/Lex/TextEncoding.cpp b/clang/lib/Lex/TextEncoding.cpp
index f90fe6529c1d61..103e576aba231b 100644
--- a/clang/lib/Lex/TextEncoding.cpp
+++ b/clang/lib/Lex/TextEncoding.cpp
@@ -77,7 +77,8 @@ TextEncoding::setConvertersFromOptions(TextEncoding &TE,
if (ErrorOrConverter)
TE.FromIBM1047Converter =
std::make_unique<TextEncodingConverter>(std::move(*ErrorOrConverter));
- else
+ TInfo.ExecStrConverter = TEC.ToLiteralEncodingConverter.get();
+ } else
return ErrorOrConverter.getError();
return std::error_code();
diff --git a/clang/test/CodeGen/systemz-charset.cpp b/clang/test/CodeGen/systemz-charset.cpp
index b1c58b3336bb39..76a778b5fbf4bf 100644
--- a/clang/test/CodeGen/systemz-charset.cpp
+++ b/clang/test/CodeGen/systemz-charset.cpp
@@ -73,7 +73,6 @@ const char32_t *UnicodeUCNString32 = U"\u00E2\u00AC\U000000DF";
//CHECK: [4 x i32] [i32 226, i32 172, i32 223, i32 0]
//CHECK-UTF8: [4 x i32] [i32 226, i32 172, i32 223, i32 0]
-
struct string_view {
int S;
const char* D;
@@ -104,3 +103,6 @@ void function()
// CHECK-UTF8: asm{{.*}}\09nop\0A
}
+const char *file = __builtin_FILE();
+//CHECK: {{.*}}\A2\A8\A2\A3\85\94\A9`\83\88\81\99\A2\85\A3K\83\97\97\00"
+//CHECK-UTF8: {{.*}}systemz-charset.cpp\00"
>From ab440549a8e8f22f18234514850d9c7b5a841480 Mon Sep 17 00:00:00 2001
From: Abhina Sreeskantharajan <Abhina.Sreeskantharajan at ibm.com>
Date: Fri, 22 May 2026 08:51:37 -0400
Subject: [PATCH 2/2] Convert the key before cache lookup to prevent encoding
differences
---
clang/lib/AST/ASTContext.cpp | 18 +++++++++---------
clang/lib/Lex/TextEncoding.cpp | 5 +++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index ce0d1a0c9d267a..1453534dc186dd 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -13951,6 +13951,15 @@ QualType ASTContext::getStringLiteralArrayType(QualType EltTy,
StringLiteral *
ASTContext::getPredefinedStringLiteralFromCache(StringRef Key) const {
+ // Apply encoding conversion to the key before cache lookup to ensure
+ // proper deduplication when the same source location is used multiple times
+ SmallString<128> ConvertedKey;
+ llvm::TextEncodingConverter *Converter = getTargetInfo().ExecStrConverter;
+ if (Converter) {
+ Converter->convert(Key, ConvertedKey);
+ Key = ConvertedKey;
+ }
+
StringLiteral *&Result = StringLiteralCache[Key];
if (!Result)
Result = StringLiteral::Create(
@@ -13958,15 +13967,6 @@ ASTContext::getPredefinedStringLiteralFromCache(StringRef Key) const {
/*Pascal*/ false, getStringLiteralArrayType(CharTy, Key.size()),
SourceLocation());
- llvm::TextEncodingConverter *Converter = getTargetInfo().ExecStrConverter;
- if (Converter) {
- SmallString<128> Converted;
- Converter->convert(Result->getString(), Converted);
- Result = StringLiteral::Create(
- *this, Converted, StringLiteralKind::Ordinary, /*Pascal*/ false,
- getStringLiteralArrayType(CharTy, Converted.size()), SourceLocation());
- }
-
return Result;
}
diff --git a/clang/lib/Lex/TextEncoding.cpp b/clang/lib/Lex/TextEncoding.cpp
index 103e576aba231b..4623bd301d34a8 100644
--- a/clang/lib/Lex/TextEncoding.cpp
+++ b/clang/lib/Lex/TextEncoding.cpp
@@ -55,6 +55,8 @@ TextEncoding::setConvertersFromOptions(TextEncoding &TE,
return ErrorOrLiteralConverter.getError();
}
+ TInfo.ExecStrConverter = TE.ToLiteralEncodingConverter.get();
+
if (TInfo.getDefaultOrdinaryLiteralEncoding() == UTF8)
return std::error_code();
@@ -77,8 +79,7 @@ TextEncoding::setConvertersFromOptions(TextEncoding &TE,
if (ErrorOrConverter)
TE.FromIBM1047Converter =
std::make_unique<TextEncodingConverter>(std::move(*ErrorOrConverter));
- TInfo.ExecStrConverter = TEC.ToLiteralEncodingConverter.get();
- } else
+ else
return ErrorOrConverter.getError();
return std::error_code();
More information about the llvm-branch-commits
mailing list