Improve impPopCallArgs (#68736)

dotnet · May 6, 2022 · 067e694 · 067e694
1 parent dd74d3e
commit 067e694
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 118 deletions.
diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -3550,8 +3550,9 @@ class Compiler
  void impResolveToken(const BYTE* addr, CORINFO_RESOLVED_TOKEN* pResolvedToken, CorInfoTokenKind kind);
 
  void impPushOnStack(GenTree* tree, typeInfo ti);
- void impPushNullObjRefOnStack();
- StackEntry impPopStack();
+ void impPushNullObjRefOnStack();
+ StackEntry impPopStack();
+ void impPopStack(unsigned n);
  StackEntry& impStackTop(unsigned n = 0);
  unsigned impStackHeight();
 
@@ -3908,11 +3909,11 @@ class Compiler
  ((opcode >= CEE_STLOC_0) && (opcode <= CEE_STLOC_3)));
  }
 
- void impPopCallArgs(unsigned count, CORINFO_SIG_INFO* sig, GenTreeCall* call);
+ void impPopCallArgs(CORINFO_SIG_INFO* sig, GenTreeCall* call);
 
  bool impCheckImplicitArgumentCoercion(var_types sigType, var_types nodeType) const;
 
- void impPopReverseCallArgs(unsigned count, CORINFO_SIG_INFO* sig, GenTreeCall* call, unsigned skipReverseCount = 0);
+ void impPopReverseCallArgs(CORINFO_SIG_INFO* sig, GenTreeCall* call, unsigned skipReverseCount);
 
  //---------------- Spilling the importer stack ----------------------------
 

diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
@@ -1675,6 +1675,23 @@ CallArg* CallArgs::InsertAfter(Compiler* comp, CallArg* after, GenTree* node, We
  assert(found && "Could not find arg to insert after in argument list");
 #endif
 
+ return InsertAfterUnchecked(comp, after, node, wellKnownArg);
+}
+
+//---------------------------------------------------------------
+// InsertAfterUnchecked: Create a new argument after another argument, without debug checks.
+//
+// Parameters:
+// comp - The compiler.
+// after - The existing argument to insert the new argument after.
+// node - The IR node for the argument.
+// wellKnownArg - The kind of argument, if special.
+//
+// Returns:
+// The created representative for the argument.
+//
+CallArg* CallArgs::InsertAfterUnchecked(Compiler* comp, CallArg* after, GenTree* node, WellKnownArg wellKnownArg)
+{
  CallArg* newArg = new (comp, CMK_CallArgs) CallArg(wellKnownArg);
  newArg->SetEarlyNode(node);
  newArg->SetNext(after->GetNext());

diff --git a/src/coreclr/jit/gentree.h b/src/coreclr/jit/gentree.h
@@ -4339,6 +4339,10 @@ class CallArgs
  CallArg* PushFront(Compiler* comp, GenTree* node, WellKnownArg wellKnownArg = WellKnownArg::None);
  CallArg* PushBack(Compiler* comp, GenTree* node, WellKnownArg wellKnownArg = WellKnownArg::None);
  CallArg* InsertAfter(Compiler* comp, CallArg* after, GenTree* node, WellKnownArg wellKnownArg = WellKnownArg::None);
+ CallArg* InsertAfterUnchecked(Compiler* comp,
+ CallArg* after,
+ GenTree* node,
+ WellKnownArg wellKnownArg = WellKnownArg::None);
  CallArg* InsertInstParam(Compiler* comp, GenTree* node);
  CallArg* InsertAfterThisOrFirst(Compiler* comp, GenTree* node, WellKnownArg wellKnownArg = WellKnownArg::None);
  void PushLateBack(CallArg* arg);