Merge upstream

src/coreclr/jit/importer.cpp

@@ -809,7 +809,7 @@ GenTree* Compiler::impStoreStruct(GenTree* store,
 
  // TODO-Bug?: verify if flags matter here
  GenTreeFlags indirFlags = GTF_EMPTY;
- GenTree* destAddr = impGetNodeAddr(dest, CHECK_SPILL_ALL, &indirFlags);
+ GenTree* destAddr = impGetNodeAddr(store, CHECK_SPILL_ALL, &indirFlags);
  NewCallArg newArg = NewCallArg::Primitive(destAddr).WellKnown(wellKnownArgType);
 
 #if !defined(TARGET_ARM)
@@ -913,7 +913,7 @@ GenTree* Compiler::impStoreStruct(GenTree* store,
  // insert the return value buffer into the argument list as first byref parameter after 'this'
  // TODO-Bug?: verify if flags matter here
  GenTreeFlags indirFlags = GTF_EMPTY;
- GenTree* destAddr = impGetNodeAddr(dest, CHECK_SPILL_ALL, &indirFlags);
+ GenTree* destAddr = impGetNodeAddr(store, CHECK_SPILL_ALL, &indirFlags);
  call->gtArgs.InsertAfterThisOrFirst(this,
  NewCallArg::Primitive(destAddr).WellKnown(WellKnownArg::RetBuffer));
 
@@ -931,21 +931,16 @@ GenTree* Compiler::impStoreStruct(GenTree* store,
  // Since we are assigning the result of a GT_MKREFANY, "destAddr" must point to a refany.
  // TODO-CQ: we can do this without address-exposing the local on the LHS.
  GenTreeFlags indirFlags = GTF_EMPTY;
- GenTree* destAddr = impGetNodeAddr(dest, CHECK_SPILL_ALL, &indirFlags);
+ GenTree* destAddr = impGetNodeAddr(store, CHECK_SPILL_ALL, &indirFlags);
  GenTree* destAddrClone;
  destAddr = impCloneExpr(destAddr, &destAddrClone, curLevel, pAfterStmt DEBUGARG("MKREFANY assignment"));
 
  assert(OFFSETOF__CORINFO_TypedReference__dataPtr == 0);
  assert(destAddr->gtType == TYP_I_IMPL || destAddr->gtType == TYP_BYREF);
 
- GenTree* ptrSlot = gtNewIndir(TYP_I_IMPL, destAddr, indirFlags);
- GenTreeIntCon* typeFieldOffset = gtNewIconNode(OFFSETOF__CORINFO_TypedReference__type, TYP_I_IMPL);
-
- GenTree* typeSlot =
- gtNewIndir(TYP_I_IMPL, gtNewOperNode(GT_ADD, destAddr->gtType, destAddrClone, typeFieldOffset), indirFlags);
-
- // append the assign of the pointer value
- GenTree* asg = gtNewAssignNode(ptrSlot, src->AsOp()->gtOp1);
+ // Append the store of the pointer value.
+ // TODO-Bug: the pointer value can be a byref. Use its actual type here instead of TYP_I_IMPL.
+ GenTree* ptrFieldStore = gtNewStoreIndNode(TYP_I_IMPL, destAddr, src->AsOp()->gtOp1, indirFlags);
  if (pAfterStmt)
  {
  Statement* newStmt = gtNewStmt(ptrFieldStore, usedDI);
@@ -1005,6 +1000,30 @@ GenTree* Compiler::impStoreStruct(GenTree* store,
  return store;
 }
 
+//------------------------------------------------------------------------
+// impStoreStructPtr: Store (copy) the structure from 'src' to 'destAddr'.
+//
+// Arguments:
+// destAddr - address of the destination of the store
+// value - value to store
+// curLevel - stack level for which a spill may be being done
+//
+// Return Value:
+// The tree that should be appended to the statement list that represents the store.
+//
+// Notes:
+// Temp stores may be appended to impStmtList if spilling is necessary.
+//
+GenTree* Compiler::impStoreStructPtr(GenTree* destAddr, GenTree* value, unsigned curLevel)
+{
+ var_types type = value->TypeGet();
+ ClassLayout* layout = (type == TYP_STRUCT) ? value->GetLayout(this) : nullptr;
+ GenTree* store = gtNewStoreValueNode(type, layout, destAddr, value);
+ store = impStoreStruct(store, curLevel);
+
+ return store;
+}
+
 //------------------------------------------------------------------------
 // impGetNodeAddr: Get the address of a value.
 //
@@ -1016,7 +1035,7 @@ GenTree* Compiler::impStoreStruct(GenTree* store,
 // are included in the GTF_IND_COPYABLE_FLAGS mask.
 //
 // Return Value:
-// In case "val" can represent locations (is an indirection/local),
+// In case "val" represents a location (is an indirection/local),
 // will return its address. Otherwise, address of a temporary assigned
 // the value of "val" will be returned.
 //
@@ -1030,6 +1049,8 @@ GenTree* Compiler::impGetNodeAddr(GenTree* val, unsigned curLevel, GenTreeFlags*
  {
  case GT_BLK:
  case GT_IND:
+ case GT_STOREIND:
+ case GT_STORE_BLK:
  if (pDerefFlags != nullptr)
  {
  *pDerefFlags = val->gtFlags & GTF_IND_COPYABLE_FLAGS;
@@ -1038,10 +1059,12 @@ GenTree* Compiler::impGetNodeAddr(GenTree* val, unsigned curLevel, GenTreeFlags*
  break;
 
  case GT_LCL_VAR:
+ case GT_STORE_LCL_VAR:
  val->gtFlags |= GTF_VAR_MOREUSES;
  return gtNewLclVarAddrNode(val->AsLclVar()->GetLclNum(), TYP_BYREF);
 
  case GT_LCL_FLD:
+ case GT_STORE_LCL_FLD:
  val->gtFlags |= GTF_VAR_MOREUSES;
  return gtNewLclAddrNode(val->AsLclFld()->GetLclNum(), val->AsLclFld()->GetLclOffs(), TYP_BYREF);
 
@@ -1054,7 +1077,7 @@ GenTree* Compiler::impGetNodeAddr(GenTree* val, unsigned curLevel, GenTreeFlags*
  }
 
  unsigned lclNum = lvaGrabTemp(true DEBUGARG("location for address-of(RValue)"));
- impAssignTempGen(lclNum, val, curLevel);
+ impStoreTemp(lclNum, val, curLevel);
 
  // The 'return value' is now address of the temp itself.
  return gtNewLclVarAddrNode(lclNum, TYP_BYREF);

src/coreclr/jit/promotiondecomposition.cpp

@@ -537,12 +537,12 @@ class DecompositionPlan
 
  if (m_store->OperIs(GT_STORE_BLK))
  {
- addr  = m_dst->gtGetOp1();
- indirFlags = m_dst->gtFlags & GTF_IND_COPYABLE_FLAGS;
+ addr = m_store->AsIndir()->Addr();
+ indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
  }
  else if (m_src->OperIs(GT_BLK))
  {
- addr  = m_src->gtGetOp1();
+ addr = m_src->AsIndir()->Addr();
  indirFlags = m_src->gtFlags & GTF_IND_COPYABLE_FLAGS;
  }