Skip to content

Delete GT_FIELD #85568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 3, 2023
Merged

Delete GT_FIELD #85568

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34f6995
Delete GT_FIELD
SingleAccretion Nov 12, 2022
83ea05b
GenTreeField -> GenTreeFieldAddr
SingleAccretion Apr 30, 2023
696c630
Revert changes to SIMD contiguity logic
SingleAccretion May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,6 @@ bool IntegralRange::Contains(int64_t value) const
break;
#endif // defined(FEATURE_HW_INTRINSICS)

case GT_FIELD:
{
if (node->AsField()->IsSpanLength())
{
return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
}
break;
}

default:
break;
}
Expand Down
13 changes: 1 addition & 12 deletions src/coreclr/jit/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9716,17 +9716,6 @@ void cTreeFlags(Compiler* comp, GenTree* tree)
case GT_NO_OP:
break;

case GT_FIELD:
if (tree->gtFlags & GTF_FLD_VOLATILE)
{
chars += printf("[FLD_VOLATILE]");
}
if (tree->gtFlags & GTF_FLD_TGT_HEAP)
{
chars += printf("[FLD_TGT_HEAP]");
}
break;

case GT_INDEX_ADDR:
if (tree->gtFlags & GTF_INX_RNGCHK)
{
Expand Down Expand Up @@ -10330,7 +10319,7 @@ var_types Compiler::gtTypeForNullCheck(GenTree* tree)
//
void Compiler::gtChangeOperToNullCheck(GenTree* tree, BasicBlock* block)
{
assert(tree->OperIs(GT_FIELD, GT_IND, GT_BLK));
assert(tree->OperIs(GT_IND, GT_BLK));
tree->ChangeOper(GT_NULLCHECK);
tree->ChangeType(gtTypeForNullCheck(tree));
tree->SetIndirExceptionFlags(this);
Expand Down
17 changes: 8 additions & 9 deletions src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2803,12 +2803,12 @@ class Compiler
GenTreeLclFld* gtNewLclFldNode(unsigned lnum, var_types type, unsigned offset);
GenTreeRetExpr* gtNewInlineCandidateReturnExpr(GenTreeCall* inlineCandidate, var_types type);

GenTreeField* gtNewFieldRef(var_types type, CORINFO_FIELD_HANDLE fldHnd, GenTree* obj = nullptr, DWORD offset = 0);
GenTreeFieldAddr* gtNewFieldAddrNode(var_types type,
CORINFO_FIELD_HANDLE fldHnd,
GenTree* obj = nullptr,
DWORD offset = 0);

GenTreeField* gtNewFieldAddrNode(var_types type,
CORINFO_FIELD_HANDLE fldHnd,
GenTree* obj = nullptr,
DWORD offset = 0);
GenTreeIndir* gtNewFieldIndirNode(var_types type, ClassLayout* layout, GenTreeFieldAddr* addr);

GenTreeIndexAddr* gtNewIndexAddr(GenTree* arrayOp,
GenTree* indexOp,
Expand Down Expand Up @@ -5912,7 +5912,7 @@ class Compiler
void fgAssignSetVarDef(GenTree* tree);

private:
GenTree* fgMorphField(GenTree* tree, MorphAddrContext* mac);
GenTree* fgMorphFieldAddr(GenTree* tree, MorphAddrContext* mac);
GenTree* fgMorphExpandInstanceField(GenTree* tree, MorphAddrContext* mac);
GenTree* fgMorphExpandTlsFieldAddr(GenTree* tree);
bool fgCanFastTailCall(GenTreeCall* call, const char** failReason);
Expand Down Expand Up @@ -6013,7 +6013,7 @@ class Compiler
Statement* fgMorphStmt;
unsigned fgBigOffsetMorphingTemps[TYP_COUNT];

unsigned fgGetFieldMorphingTemp(GenTreeField* type);
unsigned fgGetFieldMorphingTemp(GenTreeFieldAddr* fieldNode);

//----------------------- Liveness analysis -------------------------------

Expand Down Expand Up @@ -8634,7 +8634,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
GenTree* impSIMDPopStack();

void setLclRelatedToSIMDIntrinsic(GenTree* tree);
bool areFieldsContiguous(GenTree* op1, GenTree* op2);
bool areFieldsContiguous(GenTreeIndir* op1, GenTreeIndir* op2);
bool areLocalFieldsContiguous(GenTreeLclFld* first, GenTreeLclFld* second);
bool areArrayElementsContiguous(GenTree* op1, GenTree* op2);
bool areArgumentsContiguous(GenTree* op1, GenTree* op2);
Expand Down Expand Up @@ -11080,7 +11080,6 @@ class GenTreeVisitor
case GT_PUTARG_STK:
case GT_RETURNTRAP:
case GT_NOP:
case GT_FIELD:
case GT_FIELD_ADDR:
case GT_RETURN:
case GT_RETFILT:
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3985,7 +3985,6 @@ void GenTree::VisitOperands(TVisitor visitor)

// Unary operators with an optional operand
case GT_NOP:
case GT_FIELD:
case GT_FIELD_ADDR:
case GT_RETURN:
case GT_RETFILT:
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/forwardsub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ bool Compiler::fgForwardSubStatement(Statement* stmt)
// Don't substitute nodes args morphing doesn't handle into struct args.
//
if (fsv.IsCallArg() && fsv.GetNode()->TypeIs(TYP_STRUCT) &&
!fwdSubNode->OperIs(GT_BLK, GT_FIELD, GT_LCL_VAR, GT_LCL_FLD, GT_MKREFANY))
!fwdSubNode->OperIs(GT_BLK, GT_LCL_VAR, GT_LCL_FLD, GT_MKREFANY))
{
JITDUMP(" use is a struct arg; fwd sub node is not OBJ/LCL_VAR/LCL_FLD/MKREFANY\n");
return false;
Expand Down
Loading