Skip to content

Commit db34250

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents f252bc6 + 075e74e commit db34250

File tree

8 files changed

+33
-34
lines changed

8 files changed

+33
-34
lines changed

‎eng/pipelines/coreclr/perf-non-wasm-jobs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ jobs:
416416
nameSuffix: MACiOSAndroidMauiNet7
417417
isOfficialBuild: false
418418
pool:
419-
vmImage: 'macos-11'
419+
vmImage: 'macos-12'
420420
extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-maui-apps-net7.yml
421421
extraStepsParameters:
422422
rootFolder: '$(Build.SourcesDirectory)/artifacts/'
@@ -440,7 +440,7 @@ jobs:
440440
nameSuffix: MACiOSAndroidMauiNet6
441441
isOfficialBuild: false
442442
pool:
443-
vmImage: 'macos-11'
443+
vmImage: 'macos-12'
444444
extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-maui-apps-net6.yml
445445
extraStepsParameters:
446446
rootFolder: '$(Build.SourcesDirectory)/artifacts/'

‎src/coreclr/debug/di/divalue.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -3707,25 +3707,25 @@ HRESULT CordbArrayValue::GetDimensions(ULONG32 cdim, ULONG32 dims[])
37073707
//
37083708
// indicates whether the array has base indices
37093709
// Arguments:
3710-
// output: pbHasBaseIndices - true iff the array has more than one dimension and pbHasBaseIndices is not null
3711-
// Return Value: S_OK on success or E_INVALIDARG if pbHasBaseIndices is null
3712-
HRESULT CordbArrayValue::HasBaseIndices(BOOL *pbHasBaseIndices)
3710+
// output: pbHasBaseIndicies - true iff the array has more than one dimension and pbHasBaseIndicies is not null
3711+
// Return Value: S_OK on success or E_INVALIDARG if pbHasBaseIndicies is null
3712+
HRESULT CordbArrayValue::HasBaseIndicies(BOOL *pbHasBaseIndicies)
37133713
{
37143714
PUBLIC_REENTRANT_API_ENTRY(this);
37153715
FAIL_IF_NEUTERED(this);
3716-
VALIDATE_POINTER_TO_OBJECT(pbHasBaseIndices, BOOL *);
3716+
VALIDATE_POINTER_TO_OBJECT(pbHasBaseIndicies, BOOL *);
37173717

3718-
*pbHasBaseIndices = m_info.arrayInfo.offsetToLowerBounds != 0;
3718+
*pbHasBaseIndicies = m_info.arrayInfo.offsetToLowerBounds != 0;
37193719
return S_OK;
3720-
} // CordbArrayValue::HasBaseIndices
3720+
} // CordbArrayValue::HasBaseIndicies
37213721

37223722
// gets the base indices for a multidimensional array
37233723
// Arguments:
37243724
// input: cdim - the number of dimensions (this must be the same as the actual rank of the array)
37253725
// indices - an array to hold the base indices for the array dimensions (allocated and managed
37263726
// by the caller, it must have space for cdim elements)
37273727
// Return Value: S_OK on success or E_INVALIDARG if cdim is not equal to the array rank or indices is null
3728-
HRESULT CordbArrayValue::GetBaseIndices(ULONG32 cdim, ULONG32 indices[])
3728+
HRESULT CordbArrayValue::GetBaseIndicies(ULONG32 cdim, ULONG32 indices[])
37293729
{
37303730
PUBLIC_REENTRANT_API_ENTRY(this);
37313731
FAIL_IF_NEUTERED(this);
@@ -3743,7 +3743,7 @@ HRESULT CordbArrayValue::GetBaseIndices(ULONG32 cdim, ULONG32 indices[])
37433743
indices[i] = m_arrayLowerBase[i];
37443744

37453745
return S_OK;
3746-
} // CordbArrayValue::GetBaseIndices
3746+
} // CordbArrayValue::GetBaseIndicies
37473747

37483748
// Get an element at the position indicated by the values in indices (one index for each dimension)
37493749
// Arguments:

‎src/coreclr/debug/di/rspriv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9722,8 +9722,8 @@ class CordbArrayValue : public CordbValue,
97229722
COM_METHOD GetRank(ULONG32 * pnRank);
97239723
COM_METHOD GetCount(ULONG32 * pnCount);
97249724
COM_METHOD GetDimensions(ULONG32 cdim, ULONG32 dims[]);
9725-
COM_METHOD HasBaseIndices(BOOL * pbHasBaseIndices);
9726-
COM_METHOD GetBaseIndices(ULONG32 cdim, ULONG32 indices[]);
9725+
COM_METHOD HasBaseIndicies(BOOL * pbHasBaseIndicies);
9726+
COM_METHOD GetBaseIndicies(ULONG32 cdim, ULONG32 indices[]);
97279727
COM_METHOD GetElement(ULONG32 cdim, ULONG32 indices[], ICorDebugValue ** ppValue);
97289728
COM_METHOD GetElementAtPosition(ULONG32 nIndex, ICorDebugValue ** ppValue);
97299729

‎src/coreclr/inc/cordebug.idl

+4-4
Original file line numberDiff line numberDiff line change
@@ -6805,18 +6805,18 @@ interface ICorDebugArrayValue : ICorDebugHeapValue
68056805
length_is(cdim)] ULONG32 dims[]);
68066806

68076807
/*
6808-
* HasBaseIndices returns whether or not the array has base indices.
6808+
* HasBaseIndicies returns whether or not the array has base indices.
68096809
* If the answer is no, then all dimensions have a base index of 0.
68106810
*/
68116811

6812-
HRESULT HasBaseIndices([out] BOOL *pbHasBaseIndices);
6812+
HRESULT HasBaseIndicies([out] BOOL *pbHasBaseIndicies);
68136813

68146814
/*
6815-
* GetBaseIndices returns the base index of each dimension in
6815+
* GetBaseIndicies returns the base index of each dimension in
68166816
* the array
68176817
*/
68186818

6819-
HRESULT GetBaseIndices([in] ULONG32 cdim,
6819+
HRESULT GetBaseIndicies([in] ULONG32 cdim,
68206820
[out, size_is(cdim),
68216821
length_is(cdim)] ULONG32 indices[]);
68226822

‎src/coreclr/pal/prebuilt/inc/cordebug.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -15644,10 +15644,10 @@ EXTERN_C const IID IID_ICorDebugArrayValue;
1564415644
/* [in] */ ULONG32 cdim,
1564515645
/* [length_is][size_is][out] */ ULONG32 dims[ ]) = 0;
1564615646

15647-
virtual HRESULT STDMETHODCALLTYPE HasBaseIndices(
15648-
/* [out] */ BOOL *pbHasBaseIndices) = 0;
15647+
virtual HRESULT STDMETHODCALLTYPE HasBaseIndicies(
15648+
/* [out] */ BOOL *pbHasBaseIndicies) = 0;
1564915649

15650-
virtual HRESULT STDMETHODCALLTYPE GetBaseIndices(
15650+
virtual HRESULT STDMETHODCALLTYPE GetBaseIndicies(
1565115651
/* [in] */ ULONG32 cdim,
1565215652
/* [length_is][size_is][out] */ ULONG32 indices[ ]) = 0;
1565315653

@@ -15722,11 +15722,11 @@ EXTERN_C const IID IID_ICorDebugArrayValue;
1572215722
/* [in] */ ULONG32 cdim,
1572315723
/* [length_is][size_is][out] */ ULONG32 dims[ ]);
1572415724

15725-
HRESULT ( STDMETHODCALLTYPE *HasBaseIndices )(
15725+
HRESULT ( STDMETHODCALLTYPE *HasBaseIndicies )(
1572615726
ICorDebugArrayValue * This,
15727-
/* [out] */ BOOL *pbHasBaseIndices);
15727+
/* [out] */ BOOL *pbHasBaseIndicies);
1572815728

15729-
HRESULT ( STDMETHODCALLTYPE *GetBaseIndices )(
15729+
HRESULT ( STDMETHODCALLTYPE *GetBaseIndicies )(
1573015730
ICorDebugArrayValue * This,
1573115731
/* [in] */ ULONG32 cdim,
1573215732
/* [length_is][size_is][out] */ ULONG32 indices[ ]);
@@ -15797,11 +15797,11 @@ EXTERN_C const IID IID_ICorDebugArrayValue;
1579715797
#define ICorDebugArrayValue_GetDimensions(This,cdim,dims) \
1579815798
( (This)->lpVtbl -> GetDimensions(This,cdim,dims) )
1579915799

15800-
#define ICorDebugArrayValue_HasBaseIndices(This,pbHasBaseIndices) \
15801-
( (This)->lpVtbl -> HasBaseIndices(This,pbHasBaseIndices) )
15800+
#define ICorDebugArrayValue_HasBaseIndicies(This,pbHasBaseIndicies) \
15801+
( (This)->lpVtbl -> HasBaseIndicies(This,pbHasBaseIndicies) )
1580215802

15803-
#define ICorDebugArrayValue_GetBaseIndices(This,cdim,indices) \
15804-
( (This)->lpVtbl -> GetBaseIndices(This,cdim,indices) )
15803+
#define ICorDebugArrayValue_GetBaseIndicies(This,cdim,indices) \
15804+
( (This)->lpVtbl -> GetBaseIndicies(This,cdim,indices) )
1580515805

1580615806
#define ICorDebugArrayValue_GetElement(This,cdim,indices,ppValue) \
1580715807
( (This)->lpVtbl -> GetElement(This,cdim,indices,ppValue) )

‎src/mono/dlls/mscordbi/cordb-value.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1180,15 +1180,15 @@ HRESULT STDMETHODCALLTYPE CordbArrayValue::GetDimensions(ULONG32 cdim, ULONG32 d
11801180
return S_OK;
11811181
}
11821182

1183-
HRESULT STDMETHODCALLTYPE CordbArrayValue::HasBaseIndices(BOOL* pbHasBaseIndices)
1183+
HRESULT STDMETHODCALLTYPE CordbArrayValue::HasBaseIndicies(BOOL* pbHasBaseIndicies)
11841184
{
1185-
LOG((LF_CORDB, LL_INFO100000, "CordbArrayValue - HasBaseIndices - NOT IMPLEMENTED\n"));
1185+
LOG((LF_CORDB, LL_INFO100000, "CordbArrayValue - HasBaseIndicies - NOT IMPLEMENTED\n"));
11861186
return S_OK;
11871187
}
11881188

1189-
HRESULT STDMETHODCALLTYPE CordbArrayValue::GetBaseIndices(ULONG32 cdim, ULONG32 indices[])
1189+
HRESULT STDMETHODCALLTYPE CordbArrayValue::GetBaseIndicies(ULONG32 cdim, ULONG32 indices[])
11901190
{
1191-
LOG((LF_CORDB, LL_INFO100000, "CordbArrayValue - GetBaseIndices - NOT IMPLEMENTED\n"));
1191+
LOG((LF_CORDB, LL_INFO100000, "CordbArrayValue - GetBaseIndicies - NOT IMPLEMENTED\n"));
11921192
return E_NOTIMPL;
11931193
}
11941194

‎src/mono/dlls/mscordbi/cordb-value.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ class CordbArrayValue : public CordbBaseMono,
239239
HRESULT STDMETHODCALLTYPE GetRank(ULONG32* pnRank);
240240
HRESULT STDMETHODCALLTYPE GetCount(ULONG32* pnCount);
241241
HRESULT STDMETHODCALLTYPE GetDimensions(ULONG32 cdim, ULONG32 dims[]);
242-
HRESULT STDMETHODCALLTYPE HasBaseIndices(BOOL* pbHasBaseIndices);
243-
HRESULT STDMETHODCALLTYPE GetBaseIndices(ULONG32 cdim, ULONG32 indices[]);
242+
HRESULT STDMETHODCALLTYPE HasBaseIndicies(BOOL* pbHasBaseIndicies);
243+
HRESULT STDMETHODCALLTYPE GetBaseIndicies(ULONG32 cdim, ULONG32 indices[]);
244244
HRESULT STDMETHODCALLTYPE GetElement(ULONG32 cdim, ULONG32 indices[], ICorDebugValue** ppValue);
245245
HRESULT STDMETHODCALLTYPE GetElementAtPosition(ULONG32 nPosition, ICorDebugValue** ppValue);
246246
};

‎src/mono/mono/mini/mini-s390x.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -3594,8 +3594,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
35943594
break;
35953595
case OP_CHECK_THIS: {
35963596
/* ensure ins->sreg1 is not NULL */
3597-
s390_lg (code, s390_r0, 0, ins->sreg1, 0);
3598-
s390_ltgr (code, s390_r0, s390_r0);
3597+
s390_llgc (code, s390_r0, 0, ins->sreg1, 0);
35993598
}
36003599
break;
36013600
case OP_ARGLIST: {

0 commit comments

Comments
 (0)