summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimm Baeder <tbaeder@redhat.com>2025-09-16 05:10:13 +0200
committerGitHub <noreply@github.com>2025-09-16 05:10:13 +0200
commitc46cf1ea3bfaba58da7e046db7450d7dd6769100 (patch)
tree5c8c06c09bcdfbfc6d8a1c4a124536ccf4f5019d
parent6dde34969e108090d58a64ce0b25c78b42df6367 (diff)
[clang][bytecode][NFC] Remove BlockScope (#158656)upstream/main
Unused these days.
-rw-r--r--clang/lib/AST/ByteCode/Compiler.cpp10
-rw-r--r--clang/lib/AST/ByteCode/Compiler.h8
2 files changed, 5 insertions, 13 deletions
diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp
index 78b74acc3789..cecdb7b2dda5 100644
--- a/clang/lib/AST/ByteCode/Compiler.cpp
+++ b/clang/lib/AST/ByteCode/Compiler.cpp
@@ -2429,7 +2429,7 @@ bool Compiler<Emitter>::VisitArrayInitLoopExpr(const ArrayInitLoopExpr *E) {
// and the RHS is our SubExpr.
for (size_t I = 0; I != Size; ++I) {
ArrayIndexScope<Emitter> IndexScope(this, I);
- BlockScope<Emitter> BS(this);
+ LocalScope<Emitter> BS(this);
if (!this->visitArrayElemInit(I, SubExpr, SubExprT))
return false;
@@ -4140,7 +4140,7 @@ bool Compiler<Emitter>::VisitCXXStdInitializerListExpr(
template <class Emitter>
bool Compiler<Emitter>::VisitStmtExpr(const StmtExpr *E) {
- BlockScope<Emitter> BS(this);
+ LocalScope<Emitter> BS(this);
StmtExprScope<Emitter> SS(this);
const CompoundStmt *CS = E->getSubStmt();
@@ -5111,7 +5111,7 @@ bool Compiler<Emitter>::VisitCallExpr(const CallExpr *E) {
}
}
- BlockScope<Emitter> CallScope(this, ScopeKind::Call);
+ LocalScope<Emitter> CallScope(this, ScopeKind::Call);
QualType ReturnType = E->getCallReturnType(Ctx.getASTContext());
OptPrimType T = classify(ReturnType);
@@ -5475,7 +5475,7 @@ template <class Emitter> bool Compiler<Emitter>::visitStmt(const Stmt *S) {
template <class Emitter>
bool Compiler<Emitter>::visitCompoundStmt(const CompoundStmt *S) {
- BlockScope<Emitter> Scope(this);
+ LocalScope<Emitter> Scope(this);
for (const auto *InnerStmt : S->body())
if (!visitStmt(InnerStmt))
return false;
@@ -6211,7 +6211,7 @@ bool Compiler<Emitter>::compileConstructor(const CXXConstructorDecl *Ctor) {
InitLinkScope<Emitter> InitScope(this, InitLink::This());
for (const auto *Init : Ctor->inits()) {
// Scope needed for the initializers.
- BlockScope<Emitter> Scope(this);
+ LocalScope<Emitter> Scope(this);
const Expr *InitExpr = Init->getInit();
if (const FieldDecl *Member = Init->getMember()) {
diff --git a/clang/lib/AST/ByteCode/Compiler.h b/clang/lib/AST/ByteCode/Compiler.h
index 5f392964c076..09599b354788 100644
--- a/clang/lib/AST/ByteCode/Compiler.h
+++ b/clang/lib/AST/ByteCode/Compiler.h
@@ -624,14 +624,6 @@ public:
UnsignedOrNone Idx = std::nullopt;
};
-/// Scope for storage declared in a compound statement.
-// FIXME: Remove?
-template <class Emitter> class BlockScope final : public LocalScope<Emitter> {
-public:
- BlockScope(Compiler<Emitter> *Ctx, ScopeKind Kind = ScopeKind::Block)
- : LocalScope<Emitter>(Ctx, Kind) {}
-};
-
template <class Emitter> class ArrayIndexScope final {
public:
ArrayIndexScope(Compiler<Emitter> *Ctx, uint64_t Index) : Ctx(Ctx) {