Skip to content

Commit

Permalink
Fix spelling of OverideEventProvider (#45113)
Browse files Browse the repository at this point in the history
* Fix spelling of OverideEventProvider

* Fix a few more "overrides" in comments
  • Loading branch information
stephentoub committed Nov 25, 2020
1 parent 837785f commit 2c155c2
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/coreclr/src/debug/ee/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ bool DebuggerController::ApplyPatch(DebuggerControllerPatch *patch)
LOG((LF_CORDB, LL_INFO10000, "DC::ApplyPatch at addr 0x%p\n",
patch->address));

// If we try to apply an already applied patch, we'll overide our saved opcode
// If we try to apply an already applied patch, we'll override our saved opcode
// with the break opcode and end up getting a break in out patch bypass buffer.
_ASSERTE(!patch->IsActivated() );
_ASSERTE(patch->IsBound());
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/vm/ceeload.h
Original file line number Diff line number Diff line change
Expand Up @@ -3282,7 +3282,7 @@ class ReflectionModule : public Module
void Destruct();
#endif // !DACCESS_COMPILE && !CROSSGEN_COMPILE

// Overides functions to access sections
// Overrides functions to access sections
virtual TADDR GetIL(RVA target);
virtual PTR_VOID GetRvaField(RVA rva, BOOL fZapped);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void GetHostFxrPath_DotNetRootParameter(bool explicitLoad, bool useAssemb
[InlineData(false, true, false, true)]
public void GetHostFxrPath_GlobalInstallation(bool explicitLoad, bool useAssemblyPath, bool useRegisteredLocation, bool isValid)
{
// Overide the registry key for self-registered global installs.
// Override the registry key for self-registered global installs.
// If using the registered location, set the install location value to the valid/invalid root.
// If not using the registered location, do not set the value. When the value does not exist,
// the product falls back to the default install location.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ private void VerifyIsAttachedToConfigRecord()
// It may not be editable for the following reasons:
// - We are in Runtime mode, not Design time
// - The section is not attached to a _configRecord.
// - We are locked (ie. allowOveride = false )
// - We are locked (ie. AllowOverride = false )
// - We are a parent section (ie. Retrieved from GetParentSection)
//
internal void VerifyIsEditable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1481,12 +1481,12 @@ private unsafe void Initialize(Guid eventSourceGuid, string eventSourceName, str
#endif
#if FEATURE_MANAGED_ETW
// Register the provider with ETW
var etwProvider = new OverideEventProvider(this, EventProviderType.ETW);
var etwProvider = new OverrideEventProvider(this, EventProviderType.ETW);
etwProvider.Register(this);
#endif
#if FEATURE_PERFTRACING
// Register the provider with EventPipe
var eventPipeProvider = new OverideEventProvider(this, EventProviderType.EventPipe);
var eventPipeProvider = new OverrideEventProvider(this, EventProviderType.EventPipe);
lock (EventListener.EventListenersLock)
{
eventPipeProvider.Register(this);
Expand Down Expand Up @@ -2444,9 +2444,9 @@ internal static EventOpcode GetOpcodeWithDefault(EventOpcode opcode, string? eve
/// <summary>
/// This class lets us hook the 'OnEventCommand' from the eventSource.
/// </summary>
private class OverideEventProvider : EventProvider
private class OverrideEventProvider : EventProvider
{
public OverideEventProvider(EventSource eventSource, EventProviderType providerType)
public OverrideEventProvider(EventSource eventSource, EventProviderType providerType)
: base(providerType)
{
this.m_eventSource = eventSource;
Expand Down Expand Up @@ -3774,12 +3774,12 @@ private bool SelfDescribingEvents
// Dispatching state
internal volatile EventDispatcher? m_Dispatchers; // Linked list of code:EventDispatchers we write the data to (we also do ETW specially)
#if FEATURE_MANAGED_ETW
private volatile OverideEventProvider m_etwProvider = null!; // This hooks up ETW commands to our 'OnEventCommand' callback
private volatile OverrideEventProvider m_etwProvider = null!; // This hooks up ETW commands to our 'OnEventCommand' callback
#endif
#if FEATURE_PERFTRACING
private object? m_createEventLock;
private IntPtr m_writeEventStringEventHandle = IntPtr.Zero;
private volatile OverideEventProvider m_eventPipeProvider = null!;
private volatile OverrideEventProvider m_eventPipeProvider = null!;
#endif
private bool m_completelyInited; // The EventSource constructor has returned without exception.
private Exception? m_constructionException; // If there was an exception construction, this is it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public JsonConverter GetConverter(Type typeToConvert)
}

// Priority 2: Attempt to get custom converter added at runtime.
// Currently there is not a way at runtime to overide the [JsonConverter] when applied to a property.
// Currently there is not a way at runtime to override the [JsonConverter] when applied to a property.
foreach (JsonConverter item in Converters)
{
if (item.CanConvert(typeToConvert))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public static void CustomAttributeOnTypeAndProperty()

ClassWithJsonConverterAttributeOverride point = JsonSerializer.Deserialize<ClassWithJsonConverterAttributeOverride>(json);

// The property attribute overides the type attribute.
// The property attribute overrides the type attribute.
Assert.Equal(101, point.Point1.X);
Assert.Equal(102, point.Point1.Y);

Expand All @@ -187,7 +187,7 @@ public static void CustomAttributeOnPropertyAndRuntime()

ClassWithJsonConverterAttributeOverride point = JsonSerializer.Deserialize<ClassWithJsonConverterAttributeOverride>(json);

// The property attribute overides the runtime.
// The property attribute overrides the runtime.
Assert.Equal(101, point.Point1.X);
Assert.Equal(102, point.Point1.Y);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.assembly extern System.Console { }
// this test is also regression test for VSW 395780. The difference is that
// .overrride directive in this case is in the class scope, whereas in testExplicitOverride
// .override directive in this case is in the class scope, whereas in testExplicitOverride
// .override directive is in method scope.

// Microsoft (R) .NET Framework IL Disassembler. Version 2.0.41122.00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.assembly extern System.Console { }
// this test is also regression test for VSW 395780. The difference is that
// .overrride directive in this case is in the class scope, whereas in testExplicitOverride
// .override directive in this case is in the class scope, whereas in testExplicitOverride
// .override directive is in method scope.

// Microsoft (R) .NET Framework IL Disassembler. Version 2.0.41122.00
Expand Down

0 comments on commit 2c155c2

Please sign in to comment.