[clang] [clang][bytecode][NFC] Remove `canBeInitialized()` checks (PR #239548)

Timm Baeder via cfe-commits cfe-commits at lists.llvm.org
Fri Nov 6 02:18:58 PST 2026


https://github.com/tbaederr updated https://github.com/llvm/llvm-project/pull/239548

>From 80000a538ab4366c8c295312db5e30d17ea6d836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder at redhat.com>
Date: Fri, 6 Nov 2026 11:13:46 +0100
Subject: [PATCH] [clang][bytecode][NFC] Remove `canBeInitialized()` checks

Both `initialize()` and `active()` work without that precondition these
days.
---
 clang/lib/AST/ByteCode/Interp.cpp        |  6 +--
 clang/lib/AST/ByteCode/Interp.h          | 62 ++++++++----------------
 clang/lib/AST/ByteCode/InterpBuiltin.cpp |  9 ++--
 clang/lib/AST/ByteCode/Pointer.h         | 13 ++---
 4 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/clang/lib/AST/ByteCode/Interp.cpp b/clang/lib/AST/ByteCode/Interp.cpp
index 5caede7d1a149..1d94a71e996db 100644
--- a/clang/lib/AST/ByteCode/Interp.cpp
+++ b/clang/lib/AST/ByteCode/Interp.cpp
@@ -3301,10 +3301,8 @@ bool FinishInitGlobal(InterpState &S) {
     return true;
 
   finishGlobalRecurse(S, Ptr.view());
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
 
   return true;
 }
diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h
index b96b50fe9e69f..be14cd5a3523a 100644
--- a/clang/lib/AST/ByteCode/Interp.h
+++ b/clang/lib/AST/ByteCode/Interp.h
@@ -1833,7 +1833,6 @@ bool InitThisField(InterpState &S, CodePtr OpPC, uint32_t I) {
     return false;
 
   const Pointer &Field = This.atField(I);
-  assert(Field.canBeInitialized());
   Field.deref<T>() = S.Stk.pop<T>();
   Field.initialize();
   return true;
@@ -1850,7 +1849,6 @@ bool InitThisFieldActivate(InterpState &S, CodePtr OpPC, uint32_t I) {
     return false;
 
   const Pointer &Field = This.atField(I);
-  assert(Field.canBeInitialized());
   Field.deref<T>() = S.Stk.pop<T>();
   Field.activate();
   Field.initialize();
@@ -1869,7 +1867,6 @@ bool InitThisBitField(InterpState &S, CodePtr OpPC, uint32_t FieldOffset,
     return false;
 
   const Pointer &Field = This.atField(FieldOffset);
-  assert(Field.canBeInitialized());
   const auto &Value = S.Stk.pop<T>();
 
   if constexpr (isIntegralOrPointer<T>()) {
@@ -1894,7 +1891,6 @@ bool InitThisBitFieldActivate(InterpState &S, CodePtr OpPC,
     return false;
 
   const Pointer &Field = This.atField(FieldOffset);
-  assert(Field.canBeInitialized());
   const auto &Value = S.Stk.pop<T>();
 
   if constexpr (isIntegralOrPointer<T>()) {
@@ -2112,33 +2108,27 @@ inline bool GetPtrThisBase(InterpState &S, CodePtr OpPC, uint32_t Off) {
 
 inline bool FinishInitPop(InterpState &S) {
   const Pointer &Ptr = S.Stk.pop<Pointer>();
-  if (Ptr.canBeInitialized())
-    Ptr.initialize();
+  Ptr.initialize();
   return true;
 }
 
 inline bool FinishInit(InterpState &S) {
   const Pointer &Ptr = S.Stk.peek<Pointer>();
-  if (Ptr.canBeInitialized())
-    Ptr.initialize();
+  Ptr.initialize();
   return true;
 }
 
 inline bool FinishInitActivate(InterpState &S) {
   const Pointer &Ptr = S.Stk.peek<Pointer>();
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
   return true;
 }
 
 inline bool FinishInitActivatePop(InterpState &S) {
   const Pointer &Ptr = S.Stk.pop<Pointer>();
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
   return true;
 }
 
@@ -2265,8 +2255,7 @@ bool Store(InterpState &S, CodePtr OpPC) {
     return false;
   if (!Ptr.canDeref(Name))
     return false;
-  if (Ptr.canBeInitialized())
-    Ptr.initialize();
+  Ptr.initialize();
   Ptr.deref<T>() = Value;
   return true;
 }
@@ -2279,16 +2268,14 @@ bool StorePop(InterpState &S, CodePtr OpPC) {
     return false;
   if (!Ptr.canDeref(Name))
     return false;
-  if (Ptr.canBeInitialized())
-    Ptr.initialize();
+  Ptr.initialize();
   Ptr.deref<T>() = Value;
   return true;
 }
 
 static inline bool Activate(InterpState &S) {
   const Pointer &Ptr = S.Stk.peek<Pointer>();
-  if (Ptr.canBeInitialized())
-    Ptr.activate();
+  Ptr.activate();
   return true;
 }
 
@@ -2299,7 +2286,6 @@ static inline bool ActivateThisField(InterpState &S, uint32_t I) {
     return false;
 
   const Pointer &Ptr = S.Current->getThis();
-  assert(Ptr.atField(I).canBeInitialized());
   Ptr.atField(I).activate();
   return true;
 }
@@ -2311,10 +2297,8 @@ bool StoreActivate(InterpState &S, CodePtr OpPC) {
 
   if (!CheckStore(S, OpPC, Ptr, AK_Assign, /*WillBeActivated=*/true))
     return false;
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
   Ptr.deref<T>() = Value;
   return true;
 }
@@ -2326,10 +2310,8 @@ bool StoreActivatePop(InterpState &S, CodePtr OpPC) {
 
   if (!CheckStore(S, OpPC, Ptr, AK_Assign, /*WillBeActivated=*/true))
     return false;
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
   Ptr.deref<T>() = Value;
   return true;
 }
@@ -2341,8 +2323,7 @@ bool StoreBitField(InterpState &S, CodePtr OpPC) {
 
   if (!CheckStore(S, OpPC, Ptr))
     return false;
-  if (Ptr.canBeInitialized())
-    Ptr.initialize();
+  Ptr.initialize();
   if (const auto *FD = Ptr.getField())
     Ptr.deref<T>() = Value.truncate(FD->getBitWidthValue());
   else
@@ -2356,8 +2337,7 @@ bool StoreBitFieldPop(InterpState &S, CodePtr OpPC) {
   const Pointer &Ptr = S.Stk.pop<Pointer>();
   if (!CheckStore(S, OpPC, Ptr))
     return false;
-  if (Ptr.canBeInitialized())
-    Ptr.initialize();
+  Ptr.initialize();
   if (const auto *FD = Ptr.getField())
     Ptr.deref<T>() = Value.truncate(FD->getBitWidthValue());
   else
@@ -2372,10 +2352,8 @@ bool StoreBitFieldActivate(InterpState &S, CodePtr OpPC) {
 
   if (!CheckStore(S, OpPC, Ptr, AK_Assign, /*WillBeActivated=*/true))
     return false;
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
   if (const auto *FD = Ptr.getField())
     Ptr.deref<T>() = Value.truncate(FD->getBitWidthValue());
   else
@@ -2390,10 +2368,8 @@ bool StoreBitFieldActivatePop(InterpState &S, CodePtr OpPC) {
 
   if (!CheckStore(S, OpPC, Ptr, AK_Assign, /*WillBeActivated=*/true))
     return false;
-  if (Ptr.canBeInitialized()) {
-    Ptr.initialize();
-    Ptr.activate();
-  }
+  Ptr.initialize();
+  Ptr.activate();
   if (const auto *FD = Ptr.getField())
     Ptr.deref<T>() = Value.truncate(FD->getBitWidthValue());
   else
diff --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
index 8a613c77bcc33..e35e198da0dcb 100644
--- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp
+++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
@@ -1027,8 +1027,7 @@ static bool interp__builtin_overflowop(InterpState &S, CodePtr OpPC,
 
   // Write Result to ResultPtr and put Overflow on the stack.
   assignIntegral(S, ResultPtr, ResultT, Result);
-  if (ResultPtr.canBeInitialized())
-    ResultPtr.initialize();
+  ResultPtr.initialize();
 
   assert(Call->getDirectCallee()->getReturnType()->isBooleanType());
   S.Stk.push<Boolean>(Overflow);
@@ -1091,8 +1090,7 @@ static bool interp__builtin_carryop(InterpState &S, CodePtr OpPC,
   QualType CarryOutType = Call->getArg(3)->getType()->getPointeeType();
   PrimType CarryOutT = *S.getContext().classify(CarryOutType);
   assignIntegral(S, CarryOutPtr, CarryOutT, CarryOut);
-  if (CarryOutPtr.canBeInitialized())
-    CarryOutPtr.initialize();
+  CarryOutPtr.initialize();
 
   assert(S.getASTContext().hasSimilarType(Call->getType(),
                                           Call->getArg(0)->getType()));
@@ -7137,8 +7135,7 @@ static bool copyRecord(InterpState &S, CodePtr OpPC, PtrView Src, PtrView Dest,
       }
 
       TYPE_SWITCH(*FT, DestField.deref<T>() = SrcField.deref<T>(););
-      if (DestField.canBeInitialized())
-        DestField.initialize();
+      DestField.initialize();
       if (Activate)
         DestField.activate();
       return true;
diff --git a/clang/lib/AST/ByteCode/Pointer.h b/clang/lib/AST/ByteCode/Pointer.h
index 3e923a9c1a4c9..3fd8992fbca82 100644
--- a/clang/lib/AST/ByteCode/Pointer.h
+++ b/clang/lib/AST/ByteCode/Pointer.h
@@ -56,7 +56,6 @@ struct PtrView {
   bool inUnion() const { return getInlineDesc()->InUnion; };
   bool inArray() const { return getFieldDesc()->IsArray; }
   bool inPrimitiveArray() const { return getFieldDesc()->isPrimitiveArray(); }
-  bool canBeInitialized() const { return Pointee; }
   const Block *block() const { return Pointee; }
 
   unsigned getEvalID() { return Pointee->getEvalID(); }
@@ -845,12 +844,6 @@ class Pointer {
       return Opaque.isRoot();
     return true;
   }
-  /// If this pointer has an InlineDescriptor we can use to initialize.
-  bool canBeInitialized() const {
-    if (!isBlockPointer())
-      return false;
-    return view().canBeInitialized();
-  }
 
   [[nodiscard]] const BlockPointer &asBlockPointer() const {
     assert(isBlockPointer());
@@ -1259,7 +1252,11 @@ class Pointer {
   bool isElementAlive(unsigned Index) const;
 
   /// Activates a field.
-  void activate() const { view().activate(); }
+  void activate() const {
+    if (!isBlockPointer())
+      return;
+    view().activate();
+  }
   /// Deactivates an entire strurcutre.
   void deactivate() const {
     // TODO: this only appears in constructors, so nothing to deactivate.



More information about the cfe-commits mailing list