Author: Timm Baeder Date: 2026-08-30T10:15:50+02:00 New Revision: a51a886c8470778790252bc8fd26eb03353c984d
URL: https://github.com/llvm/llvm-project/commit/a51a886c8470778790252bc8fd26eb03353c984d DIFF: https://github.com/llvm/llvm-project/commit/a51a886c8470778790252bc8fd26eb03353c984d.diff LOG: [clang][bytecode] Make Scope::Desc const (#219775) We use const pointers to descriptors everywhere else. Added: Modified: clang/lib/AST/ByteCode/ByteCodeEmitter.cpp clang/lib/AST/ByteCode/ByteCodeEmitter.h clang/lib/AST/ByteCode/EvalEmitter.cpp clang/lib/AST/ByteCode/EvalEmitter.h clang/lib/AST/ByteCode/Function.h Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/ByteCodeEmitter.cpp b/clang/lib/AST/ByteCode/ByteCodeEmitter.cpp index 81f5fe25fcc35..317c86f554c37 100644 --- a/clang/lib/AST/ByteCode/ByteCodeEmitter.cpp +++ b/clang/lib/AST/ByteCode/ByteCodeEmitter.cpp @@ -89,11 +89,11 @@ void ByteCodeEmitter::compileFunc(const FunctionDecl *FuncDecl, Func->setIsFullyCompiled(true); } -Scope::Local ByteCodeEmitter::createLocal(Descriptor *D) { +Scope::Local ByteCodeEmitter::createLocal(const Descriptor *D) { NextLocalOffset += sizeof(Block); unsigned Location = NextLocalOffset; NextLocalOffset += align(Block::InlineDescMD + D->getAllocSize()); - return {Location, D}; + return {D, Location}; } void ByteCodeEmitter::emitLabel(LabelTy Label) { diff --git a/clang/lib/AST/ByteCode/ByteCodeEmitter.h b/clang/lib/AST/ByteCode/ByteCodeEmitter.h index 34342e53837b9..24244520645d7 100644 --- a/clang/lib/AST/ByteCode/ByteCodeEmitter.h +++ b/clang/lib/AST/ByteCode/ByteCodeEmitter.h @@ -70,7 +70,7 @@ class ByteCodeEmitter { bool checkingForUndefinedBehavior() const { return false; } /// Callback for local registration. - Local createLocal(Descriptor *D); + Local createLocal(const Descriptor *D); /// Parameter indices. llvm::DenseMap<const ParmVarDecl *, FuncParam> Params; diff --git a/clang/lib/AST/ByteCode/EvalEmitter.cpp b/clang/lib/AST/ByteCode/EvalEmitter.cpp index 3afc864fbfd51..9d38113ce77c2 100644 --- a/clang/lib/AST/ByteCode/EvalEmitter.cpp +++ b/clang/lib/AST/ByteCode/EvalEmitter.cpp @@ -149,7 +149,7 @@ void EvalEmitter::emitLabel(LabelTy Label) { CurrentLabel = Label; } EvalEmitter::LabelTy EvalEmitter::getLabel() { return NextLabel++; } -Scope::Local EvalEmitter::createLocal(Descriptor *D) { +Scope::Local EvalEmitter::createLocal(const Descriptor *D) { // Allocate memory for a local. auto Memory = std::make_unique<char[]>(sizeof(Block) + D->getAllocSize() + Block::InlineDescMD); @@ -170,7 +170,7 @@ Scope::Local EvalEmitter::createLocal(Descriptor *D) { // Register the local. unsigned Off = Locals.size(); Locals.push_back(std::move(Memory)); - return {Off, D}; + return {D, Off}; } bool EvalEmitter::jumpTrue(const LabelTy &Label, SourceInfo SI) { diff --git a/clang/lib/AST/ByteCode/EvalEmitter.h b/clang/lib/AST/ByteCode/EvalEmitter.h index a151329c22aa5..a80b573a7df8b 100644 --- a/clang/lib/AST/ByteCode/EvalEmitter.h +++ b/clang/lib/AST/ByteCode/EvalEmitter.h @@ -100,7 +100,7 @@ class EvalEmitter : public SourceMapper { } /// Callback for registering a local. - Local createLocal(Descriptor *D); + Local createLocal(const Descriptor *D); /// Parameter indices. llvm::DenseMap<const ParmVarDecl *, FuncParam> Params; diff --git a/clang/lib/AST/ByteCode/Function.h b/clang/lib/AST/ByteCode/Function.h index 5dec1a0eee8ca..c9060c99a83d8 100644 --- a/clang/lib/AST/ByteCode/Function.h +++ b/clang/lib/AST/ByteCode/Function.h @@ -36,10 +36,10 @@ class Scope final { public: /// Information about a local's storage. struct Local { + /// Descriptor of the local. + const Descriptor *Desc; /// Offset of the local in frame. unsigned Offset; - /// Descriptor of the local. - Descriptor *Desc; /// If the cleanup for this local should be emitted. bool EnabledByDefault = true; }; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
