https://github.com/tbaederr created
https://github.com/llvm/llvm-project/pull/125467
Remove unnecesary narrow() calls, rename a variable and initialize the array as
a whole instead of each element individually.
>From 20c472b39e94f51ed383a265f6c836f2b3276c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbae...@redhat.com>
Date: Sun, 2 Feb 2025 19:10:08 +0100
Subject: [PATCH] [clang][bytecode] Refactor Program::createGlobalString
Remove unnecesary narrow() calls, rename a variable and
initialize the array as a whole instead of each element individually.
---
clang/lib/AST/ByteCode/Program.cpp | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/clang/lib/AST/ByteCode/Program.cpp
b/clang/lib/AST/ByteCode/Program.cpp
index 1ffe7cd721f11ff..e0b86d46428a266 100644
--- a/clang/lib/AST/ByteCode/Program.cpp
+++ b/clang/lib/AST/ByteCode/Program.cpp
@@ -35,6 +35,7 @@ const void *Program::getNativePointer(unsigned Idx) {
unsigned Program::createGlobalString(const StringLiteral *S, const Expr *Base)
{
const size_t CharWidth = S->getCharByteWidth();
const size_t BitWidth = CharWidth * Ctx.getCharBit();
+ unsigned StringLength = S->getLength();
PrimType CharType;
switch (CharWidth) {
@@ -55,15 +56,15 @@ unsigned Program::createGlobalString(const StringLiteral
*S, const Expr *Base) {
Base = S;
// Create a descriptor for the string.
- Descriptor *Desc = allocateDescriptor(Base, CharType, Descriptor::GlobalMD,
- S->getLength() + 1,
- /*isConst=*/true,
- /*isTemporary=*/false,
- /*isMutable=*/false);
+ Descriptor *Desc =
+ allocateDescriptor(Base, CharType, Descriptor::GlobalMD, StringLength +
1,
+ /*isConst=*/true,
+ /*isTemporary=*/false,
+ /*isMutable=*/false);
// Allocate storage for the string.
// The byte length does not include the null terminator.
- unsigned I = Globals.size();
+ unsigned GlobalIndex = Globals.size();
unsigned Sz = Desc->getAllocSize();
auto *G = new (Allocator, Sz) Global(Ctx.getEvalID(), Desc,
/*isStatic=*/true,
/*isExtern=*/false);
@@ -74,33 +75,32 @@ unsigned Program::createGlobalString(const StringLiteral
*S, const Expr *Base) {
// Construct the string in storage.
const Pointer Ptr(G->block());
- for (unsigned I = 0, N = S->getLength(); I <= N; ++I) {
- Pointer Field = Ptr.atIndex(I).narrow();
- const uint32_t CodePoint = I == N ? 0 : S->getCodeUnit(I);
+ for (unsigned I = 0; I <= StringLength; ++I) {
+ Pointer Field = Ptr.atIndex(I);
+ const uint32_t CodePoint = I == StringLength ? 0 : S->getCodeUnit(I);
switch (CharType) {
case PT_Sint8: {
using T = PrimConv<PT_Sint8>::T;
Field.deref<T>() = T::from(CodePoint, BitWidth);
- Field.initialize();
break;
}
case PT_Uint16: {
using T = PrimConv<PT_Uint16>::T;
Field.deref<T>() = T::from(CodePoint, BitWidth);
- Field.initialize();
break;
}
case PT_Uint32: {
using T = PrimConv<PT_Uint32>::T;
Field.deref<T>() = T::from(CodePoint, BitWidth);
- Field.initialize();
break;
}
default:
llvm_unreachable("unsupported character type");
}
}
- return I;
+ Ptr.initialize();
+
+ return GlobalIndex;
}
Pointer Program::getPtrGlobal(unsigned Idx) const {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
