Skip to content

Commit d54ae90

Browse files
committed
[clang][Interp][NFC] Rename InlineDescptor::IsMutable to IsFieldMutable
1 parent 051bf9c commit d54ae90

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

clang/lib/AST/Interp/Descriptor.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,10 @@ static void ctorArrayDesc(Block *B, char *Ptr, bool IsConst, bool IsMutable,
7878
Desc->IsBase = false;
7979
Desc->IsActive = IsActive;
8080
Desc->IsConst = IsConst || D->IsConst;
81-
Desc->IsMutable = IsMutable || D->IsMutable;
81+
Desc->IsFieldMutable = IsMutable || D->IsMutable;
8282
if (auto Fn = D->ElemDesc->CtorFn)
83-
Fn(B, ElemLoc, Desc->IsConst, Desc->IsMutable, IsActive, D->ElemDesc);
83+
Fn(B, ElemLoc, Desc->IsConst, Desc->IsFieldMutable, IsActive,
84+
D->ElemDesc);
8485
}
8586
}
8687

@@ -131,9 +132,10 @@ static void ctorRecord(Block *B, char *Ptr, bool IsConst, bool IsMutable,
131132
Desc->IsBase = IsBase;
132133
Desc->IsActive = IsActive && !IsUnion;
133134
Desc->IsConst = IsConst || F->IsConst;
134-
Desc->IsMutable = IsMutable || F->IsMutable;
135+
Desc->IsFieldMutable = IsMutable || F->IsMutable;
135136
if (auto Fn = F->CtorFn)
136-
Fn(B, Ptr + SubOff, Desc->IsConst, Desc->IsMutable, Desc->IsActive, F);
137+
Fn(B, Ptr + SubOff, Desc->IsConst, Desc->IsFieldMutable, Desc->IsActive,
138+
F);
137139
};
138140
for (const auto &B : D->ElemRecord->bases())
139141
CtorSub(B.Offset, B.Desc, /*isBase=*/true);

clang/lib/AST/Interp/Descriptor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct InlineDescriptor {
7070
/// Flag indicating if the field is the active member of a union.
7171
unsigned IsActive : 1;
7272
/// Flag indicating if the field is mutable (if in a record).
73-
unsigned IsMutable : 1; // TODO: Rename to IsFieldMutable.
73+
unsigned IsFieldMutable : 1;
7474

7575
Descriptor *Desc;
7676
};

clang/lib/AST/Interp/EvalEmitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Scope::Local EvalEmitter::createLocal(Descriptor *D) {
6161
Desc.Offset = sizeof(InlineDescriptor);
6262
Desc.IsActive = true;
6363
Desc.IsBase = false;
64-
Desc.IsMutable = false;
64+
Desc.IsFieldMutable = false;
6565
Desc.IsConst = false;
6666
Desc.IsInitialized = false;
6767

clang/lib/AST/Interp/InterpFrame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ InterpFrame::InterpFrame(InterpState &S, const Function *Func,
4242
ID->IsActive = true;
4343
ID->Offset = sizeof(InlineDescriptor);
4444
ID->IsBase = false;
45-
ID->IsMutable = false;
45+
ID->IsFieldMutable = false;
4646
ID->IsConst = false;
4747
ID->IsInitialized = false;
4848
}

clang/lib/AST/Interp/Pointer.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ class Pointer {
260260
bool isStaticTemporary() const { return isStatic() && isTemporary(); }
261261

262262
/// Checks if the field is mutable.
263-
bool isMutable() const { return Base != 0 && getInlineDesc()->IsMutable; }
263+
bool isMutable() const {
264+
return Base != 0 && getInlineDesc()->IsFieldMutable;
265+
}
264266
/// Checks if an object was initialized.
265267
bool isInitialized() const;
266268
/// Checks if the object is active.

0 commit comments

Comments
 (0)