Skip to content

Commit

Permalink
[MERGE #5754 @github-john-doe] Typos
Browse files Browse the repository at this point in the history
Merge pull request #5754 from github-john-doe:typos
  • Loading branch information
dilijev committed Oct 8, 2018
2 parents 541e184 + ac64899 commit 2f70be8
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion lib/Backend/GlobOpt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17658,7 +17658,7 @@ void GlobOpt::PRE::RemoveOverlyOptimisticInitialValues(Loop * loop)
{
BasicBlock * landingPad = loop->landingPad;

// For a property sym whose obj ptr sym wasn't live in the landing pad, we can optmistically (if the obj ptr sym was
// For a property sym whose obj ptr sym wasn't live in the landing pad, we can optimistically (if the obj ptr sym was
// single def) insert an initial value in the landing pad, with the hope that PRE could make the obj ptr sym live.
// But, if PRE couldn't make the obj ptr sym live, we need to clear the value for the property sym from the landing pad

Expand Down
6 changes: 3 additions & 3 deletions lib/Common/Memory/LargeHeapBlock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ LargeHeapBlock::ScanInitialImplicitRoots(Recycler * recycler)
size_t objectSize = header->objectSize;
// trim off the trailing part which is not a pointer
objectSize = HeapInfo::RoundObjectSize(objectSize);
if (objectSize > 0) // otherwize the object total size is less than a pointer size
if (objectSize > 0) // otherwise the object total size is less than a pointer size
{
recycler->ScanObjectInlineInterior((void **)objectAddress, objectSize);
}
Expand Down Expand Up @@ -1170,7 +1170,7 @@ LargeHeapBlock::ScanNewImplicitRoots(Recycler * recycler)
size_t objectSize = header->objectSize;
// trim off the trailing part which is not a pointer
objectSize = HeapInfo::RoundObjectSize(objectSize);
if (objectSize > 0) // otherwize the object total size is less than a pointer size
if (objectSize > 0) // otherwise the object total size is less than a pointer size
{
recycler->ScanObjectInlineInterior((void **)objectAddress, objectSize);
}
Expand Down Expand Up @@ -1321,7 +1321,7 @@ LargeHeapBlock::RescanOnePage(Recycler * recycler)
objectSize = HeapInfo::RoundObjectSize(objectSize);
}
#endif
if (objectSize > 0) // otherwize the object total size is less than a pointer size
if (objectSize > 0) // otherwise the object total size is less than a pointer size
{
bool noOOMDuringMark = true;
#ifdef RECYCLER_VISITED_HOST
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Base/ThreadContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ ThreadContext::UncheckedAddPropertyId(JsUtil::CharacterBuffer<WCHAR> const& prop
{
if(this->TTDContext->GetActiveScriptContext() != nullptr && this->TTDContext->GetActiveScriptContext()->ShouldPerformReplayAction())
{
//We reload all properties that occour in the trace so they only way we get here in TTD mode is:
//We reload all properties that occur in the trace so they only way we get here in TTD mode is:
//(1) if the program is creating a new symbol (which always gets a fresh id) and we should recreate it or
//(2) if it is forcing arguments in debug parse mode (instead of regular which we recorded in)
Js::PropertyId propertyId = Js::Constants::NoProperty;
Expand Down
4 changes: 2 additions & 2 deletions lib/Runtime/Library/BoundFunction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ namespace Js
{
if (args.HasNewTarget())
{
// target has an overriden new target make a new object from the newTarget
// target has an overridden new target make a new object from the newTarget
Var newTargetVar = args.GetNewTarget();
AssertOrFailFastMsg(JavascriptOperators::IsConstructor(newTargetVar), "newTarget must be a constructor");
RecyclableObject* newTarget = UnsafeVarTo<RecyclableObject>(newTargetVar);
Expand Down Expand Up @@ -150,7 +150,7 @@ namespace Js
}
else
{
// target is a proxy without an overriden new target
// target is a proxy without an overridden new target
// give nullptr - FunctionCallTrap will make a new object
args.Values[0] = newVarInstance;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Library/IntlEngineInterfaceExtensionObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ DEFINE_ISXLOCALEAVAILABLE(PR, uloc)
hr == S_OK && unicodeCollation16Len == unicodeCollationLen && unicodeCollation16Len < MaxCharCount,
"Unicode collation char16 conversion was unsuccessful"
);
// i + 1 to not ovewrite leading null element
// i + 1 to not overwrite leading null element
ret->SetItem(i + 1, JavascriptString::NewWithBuffer(
unicodeCollation16,
unicodeCollation16Len,
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Types/DynamicObjectPropertyEnumerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ namespace Js
return false;
}

// Reload the type after EnsureObjecteReady
// Reload the type after EnsureObjectReady
type = object->GetDynamicType();
if (!type->PrepareForTypeSnapshotEnumeration())
{
Expand Down
2 changes: 1 addition & 1 deletion pal/src/cruntime/filecrt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ CorUnix::InternalFwrite(

nWrittenBytes = fwrite(pvBuffer, nSize, nCount, f);

// Make sure no error ocurred.
// Make sure no error occurred.
if ( nWrittenBytes < nCount )
{
// Set the FILE* error code
Expand Down
2 changes: 1 addition & 1 deletion pal/src/cruntime/misc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ void MiscUnsetenv(const char *name)
if (memcmp(name, palEnvironment[i], length) == 0)
{
// Remove this one. Don't free it, though, since
// there might be oustanding references to it that
// there might be outstanding references to it that
// were acquired via getenv. This is an
// unavoidable memory leak.
for(j = i + 1; palEnvironment[j] != NULL; j++) { }
Expand Down
2 changes: 1 addition & 1 deletion pal/src/misc/dbgmsg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ static BOOL DBG_get_indent(DBG_LEVEL_ID level, const char *format,
Function :
DBG_change_entrylevel
retrieve current ENTRY nesting level and [optionnally] modify it
retrieve current ENTRY nesting level and [optionally] modify it
Parameters :
int new_level : value to which the nesting level must be set, or -1
Expand Down
2 changes: 1 addition & 1 deletion pal/src/synchmgr/synchmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2997,7 +2997,7 @@ namespace CorUnix
Unregisters a process object currently monitored by the worker thread
(typically called if the wait timed out before the process exited, or
if the wait was a normal (i.e. non wait-all) wait that involved othter
if the wait was a normal (i.e. non wait-all) wait that involved other
objects, and another object has been signaled).
--*/
PAL_ERROR CPalSynchronizationManager::UnRegisterProcessForMonitoring(
Expand Down

0 comments on commit 2f70be8

Please sign in to comment.