Skip to content

Commit 4602f78

Browse files
authored
fix typos (#108116)
1 parent 4df87ae commit 4602f78

File tree

40 files changed

+182
-182
lines changed

40 files changed

+182
-182
lines changed

docs/tools/illink/error-codes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ This is technically possible if a custom assembly defines `DynamicDependencyAttr
802802
public override void TestMethod() {}
803803
}
804804
```
805-
A derived member has the attribute but the overriden base member does not have the attribute
805+
A derived member has the attribute but the overridden base member does not have the attribute
806806
```C#
807807
public class Base
808808
{
@@ -1953,7 +1953,7 @@ void TestMethod()
19531953
public override void TestMethod() {}
19541954
}
19551955
```
1956-
A derived member has the attribute but the overriden base member does not have the attribute
1956+
A derived member has the attribute but the overridden base member does not have the attribute
19571957
```C#
19581958
public class Base
19591959
{

eng/DotNetBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<InnerBuildArgs Condition="'$(DotNetBuildMonoBundleLLVMOptimizer)' != ''">$(InnerBuildArgs) /p:MonoBundleLLVMOptimizer=$(DotNetBuildMonoBundleLLVMOptimizer)</InnerBuildArgs>
7171
<InnerBuildArgs Condition="'$(PgoInstrument)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)pgoinstrument</InnerBuildArgs>
7272

73-
<!-- This prop needs to be passed to the inner build manually as the BaseInnerSourceBuildCommand gets overriden above -->
73+
<!-- This prop needs to be passed to the inner build manually as the BaseInnerSourceBuildCommand gets overridden above -->
7474
<InnerBuildArgs Condition="'$(DotNetBuildRepo)' == 'true'">$(InnerBuildArgs) /p:DotNetBuildRepo=true</InnerBuildArgs>
7575
<InnerBuildArgs Condition="'$(DotNetBuildOrchestrator)' == 'true'">$(InnerBuildArgs) /p:DotNetBuildOrchestrator=true</InnerBuildArgs>
7676
<InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>

src/coreclr/gc/gc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48839,7 +48839,7 @@ HRESULT GCHeap::Initialize()
4883948839

4884048840
nhp_from_config = static_cast<uint32_t>(GCConfig::GetHeapCount());
4884148841

48842-
// The CPU count may be overriden by the user. Ensure that we create no more than g_num_processors
48842+
// The CPU count may be overridden by the user. Ensure that we create no more than g_num_processors
4884348843
// heaps as that is the number of slots we have allocated for handle tables.
4884448844
g_num_active_processors = min (GCToEEInterface::GetCurrentProcessCpuCount(), g_num_processors);
4884548845

src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ private static void FindBaseUnificationGroup(MetadataType currentType, Unificati
465465
// We may want to build up a unification group for the base just to check the further MethodImpl case here.
466466
FindBaseUnificationGroup(baseType, unificationGroup);
467467

468-
// We should check to see if a the DefiningMethod on the base unification group is overriden via MethodImpl
468+
// We should check to see if a the DefiningMethod on the base unification group is overridden via MethodImpl
469469
// TODO! check to see if we need to check for MethodImpls affecting other members of the unification group
470470
// other than the defining method
471471
if (unificationGroup.DefiningMethod != null)

src/coreclr/tools/Common/TypeSystem/IL/Stubs/StreamIntrinsics.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ public static MethodIL EmitIL(MethodDesc method)
2727
ILEmitter emitter = new ILEmitter();
2828
ILCodeStream codestream = emitter.NewCodeStream();
2929

30-
ILCodeLabel lOverriden = emitter.NewCodeLabel();
30+
ILCodeLabel lOverridden = emitter.NewCodeLabel();
3131

3232
ILToken beginMethodToken = emitter.NewToken(beginMethod);
3333
codestream.EmitLdArg(0);
3434
codestream.Emit(ILOpcode.ldvirtftn, beginMethodToken);
3535
codestream.Emit(ILOpcode.ldftn, beginMethodToken);
36-
codestream.Emit(ILOpcode.bne_un, lOverriden);
36+
codestream.Emit(ILOpcode.bne_un, lOverridden);
3737

3838
ILToken endMethodToken = emitter.NewToken(endMethod);
3939
codestream.EmitLdArg(0);
4040
codestream.Emit(ILOpcode.ldvirtftn, endMethodToken);
4141
codestream.Emit(ILOpcode.ldftn, endMethodToken);
42-
codestream.Emit(ILOpcode.bne_un, lOverriden);
42+
codestream.Emit(ILOpcode.bne_un, lOverridden);
4343

4444
codestream.EmitLdc(0);
4545
codestream.Emit(ILOpcode.ret);
4646

47-
codestream.EmitLabel(lOverriden);
47+
codestream.EmitLabel(lOverridden);
4848
codestream.EmitLdc(1);
4949
codestream.Emit(ILOpcode.ret);
5050

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ public sealed override IEnumerable<CombinedDependencyListEntry> GetConditionalSt
400400

401401
// If this is an abstract type, only request a tentative entrypoint (whose body
402402
// might just be stubbed out). This lets us avoid generating method bodies for
403-
// virtual method on abstract types that are overriden in all their children.
403+
// virtual method on abstract types that are overridden in all their children.
404404
//
405405
// We don't do this if the method can be placed in the sealed vtable since
406-
// those can never be overriden by children anyway.
406+
// those can never be overridden by children anyway.
407407
bool canUseTentativeMethod = isNonInterfaceAbstractType
408408
&& !decl.CanMethodBeInSealedVTable(factory)
409409
&& factory.CompilationModuleGroup.AllowVirtualMethodOnAbstractTypeOptimization(canonImpl);
@@ -1031,7 +1031,7 @@ private void OutputVirtualSlots(NodeFactory factory, ref ObjectDataBuilder objDa
10311031
// If the type we're generating now is abstract, and the implementation comes from an abstract type,
10321032
// only use a tentative method entrypoint that can have its body replaced by a throwing stub
10331033
// if no "hard" reference to that entrypoint exists in the program.
1034-
// This helps us to eliminate method bodies for virtual methods on abstract types that are fully overriden
1034+
// This helps us to eliminate method bodies for virtual methods on abstract types that are fully overridden
10351035
// in the children of that abstract type.
10361036
bool canUseTentativeEntrypoint = implType is MetadataType mdImplType && mdImplType.IsAbstract && !mdImplType.IsInterface
10371037
&& implMethod.OwningType is MetadataType mdImplMethodType && mdImplMethodType.IsAbstract

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GVMDependenciesNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public override IEnumerable<CombinedDependencyListEntry> SearchDynamicDependenci
143143
openInstantiation[instArg] = context.GetSignatureVariable(instArg, method: true);
144144
MethodDesc implementingMethodInstantiation = slotDecl.MakeInstantiatedMethod(openInstantiation).InstantiateSignature(potentialOverrideType.Instantiation, _method.Instantiation);
145145

146-
// Static virtuals cannot be further overriden so this is an impl use. Otherwise it's a virtual slot use.
146+
// Static virtuals cannot be further overridden so this is an impl use. Otherwise it's a virtual slot use.
147147
if (implementingMethodInstantiation.Signature.IsStatic)
148148
dynamicDependencies.Add(new CombinedDependencyListEntry(factory.GenericVirtualMethodImpl(implementingMethodInstantiation.GetCanonMethodTarget(CanonicalFormKind.Specific)), null, "ImplementingMethodInstantiation"));
149149
else

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ private sealed class ScannedDevirtualizationManager : DevirtualizationManager
428428
private HashSet<TypeDesc> _unsealedTypes = new HashSet<TypeDesc>();
429429
private Dictionary<TypeDesc, HashSet<TypeDesc>> _implementators = new();
430430
private HashSet<TypeDesc> _disqualifiedTypes = new();
431-
private HashSet<MethodDesc> _overridenMethods = new();
431+
private HashSet<MethodDesc> _overriddenMethods = new();
432432
private HashSet<MethodDesc> _generatedVirtualMethods = new();
433433

434434
public ScannedDevirtualizationManager(NodeFactory factory, ImmutableArray<DependencyNodeCore<NodeFactory>> markedNodes)
@@ -583,7 +583,7 @@ static List<MethodDesc> BuildVTable(NodeFactory factory, TypeDesc currentType, T
583583
for (int i = 0; i < baseVtable.Count; i++)
584584
{
585585
if (baseVtable[i] != vtable[i])
586-
_overridenMethods.Add(baseVtable[i]);
586+
_overriddenMethods.Add(baseVtable[i]);
587587
}
588588
}
589589
}
@@ -681,7 +681,7 @@ public override bool IsEffectivelySealed(MethodDesc method)
681681
return false;
682682

683683
// If we haven't seen any other method override this, this method is sealed
684-
return !_overridenMethods.Contains(canonMethod);
684+
return !_overriddenMethods.Contains(canonMethod);
685685
}
686686

687687
protected override MethodDesc ResolveVirtualMethod(MethodDesc declMethod, DefType implType, out CORINFO_DEVIRTUALIZATION_DETAIL devirtualizationDetail)

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MetadataManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ public virtual void GetDependenciesDueToDelegateCreation(ref CombinedDependencyL
616616
}
617617

618618
/// <summary>
619-
/// This method is an extension point that can provide additional dependencies for overriden methods on constructed types.
619+
/// This method is an extension point that can provide additional dependencies for overridden methods on constructed types.
620620
/// </summary>
621621
public virtual void GetDependenciesForOverridingMethod(ref CombinedDependencyList dependencies, NodeFactory factory, MethodDesc decl, MethodDesc impl)
622622
{

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/TypeValidationChecker.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ Task<bool> ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation)
305305
// Override rules
306306
// Validate that each override results does not violate accessibility rules -- UNIMPLEMENTED
307307

308-
HashSet<MethodDesc> overridenDeclMethods = new HashSet<MethodDesc>();
308+
HashSet<MethodDesc> overriddenDeclMethods = new HashSet<MethodDesc>();
309309

310310
foreach (var methodImplHandle in typeDef.GetMethodImplementations())
311311
{
@@ -352,7 +352,7 @@ Task<bool> ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation)
352352
}
353353

354354
// Validate that multiple MethodImpls don't override the same method
355-
if (!overridenDeclMethods.Add(methodDecl))
355+
if (!overriddenDeclMethods.Add(methodDecl))
356356
{
357357
AddTypeValidationError(type, $"Multiple MethodImpl records override '{methodDecl}'");
358358
return false;
@@ -388,7 +388,7 @@ Task<bool> ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation)
388388
// Validate that for every override involving generic methods that the generic method constraints are matching
389389
if (!CompareMethodConstraints(interfaceMethod, resolvedMethod))
390390
{
391-
AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overriden by method '{resolvedMethod}' which does not have matching generic constraints");
391+
AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overridden by method '{resolvedMethod}' which does not have matching generic constraints");
392392
return false;
393393
}
394394
}
@@ -410,7 +410,7 @@ Task<bool> ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation)
410410
// Validate that for every override involving generic methods that the generic method constraints are matching
411411
if (!CompareMethodConstraints(interfaceMethod, impl))
412412
{
413-
AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overriden by method '{impl}' which does not have matching generic constraints");
413+
AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overridden by method '{impl}' which does not have matching generic constraints");
414414
return false;
415415
}
416416
}
@@ -428,7 +428,7 @@ Task<bool> ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation)
428428
// Validate that for every override involving generic methods that the generic method constraints are matching
429429
if (!CompareMethodConstraints(virtualMethod, implementationMethod))
430430
{
431-
AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overriden by method '{implementationMethod}' which does not have matching generic constraints");
431+
AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overridden by method '{implementationMethod}' which does not have matching generic constraints");
432432
return false;
433433
}
434434

@@ -439,7 +439,7 @@ Task<bool> ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation)
439439
var implementationOnBaseType = baseTypeVirtualMethodAlgorithm.FindVirtualFunctionTargetMethodOnObjectType(virtualMethod, type.BaseType);
440440
if (!implementationMethod.Signature.ApplySubstitution(type.Instantiation).EquivalentWithCovariantReturnType(implementationOnBaseType.Signature.ApplySubstitution(type.Instantiation)))
441441
{
442-
AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overriden by method '{implementationMethod}' does not satisfy the covariant return type introduced with '{implementationOnBaseType}'");
442+
AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overridden by method '{implementationMethod}' does not satisfy the covariant return type introduced with '{implementationOnBaseType}'");
443443
return false;
444444
}
445445
}

0 commit comments

Comments
 (0)