Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Typo] Replace PR#514-525 with one large PR #561

Merged
merged 1 commit into from Dec 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/archive/LangRef.html
Expand Up @@ -762,7 +762,7 @@ <h4 id="attribute-infix">Infix Attributes</h4>
<p>FIXME: Implement these restrictions.</p>

<!-- _____________________________________________________________________ -->
<h4 id="attribute-resilence">Resilience Attribute</h4>
<h4 id="attribute-resilience">Resilience Attribute</h4>

<pre class="grammar">
attribute-resilience ::= 'resilient'
Expand Down
2 changes: 1 addition & 1 deletion include/swift/AST/ArchetypeBuilder.h
Expand Up @@ -286,7 +286,7 @@ class ArchetypeBuilder {
/// Finalize the set of requirements, performing any remaining checking
/// required before generating archetypes.
///
/// \returns true if an error occurs, false otherwse.
/// \returns true if an error occurs, false otherwise.
bool finalize(SourceLoc loc);

/// \brief Resolve the given type to the potential archetype it names.
Expand Down
2 changes: 1 addition & 1 deletion include/swift/AST/Attr.h
Expand Up @@ -642,7 +642,7 @@ enum class MinVersionComparison {
Unavailable,

/// The entity might be unavailable, because it was introduced after
/// the minimimum version.
/// the minimum version.
PotentiallyUnavailable,

/// The entity has been obsoleted.
Expand Down
4 changes: 2 additions & 2 deletions include/swift/AST/PlatformKind.h
Expand Up @@ -32,15 +32,15 @@ enum class PlatformKind {
#include "swift/AST/PlatformKinds.def"
};

/// Returns the short string representating the platform, suitable for
/// Returns the short string representing the platform, suitable for
/// use in availability specifications (e.g., "OSX").
StringRef platformString(PlatformKind platform);

/// Returns the platform kind corresponding to the passed-in short platform name
/// or None if such a platform kind does not exist.
Optional<PlatformKind> platformFromString(StringRef Name);

/// Returns a human-readiable version of the platform name as a string, suitable
/// Returns a human-readable version of the platform name as a string, suitable
/// for emission in diagnostics (e.g., "OS X").
StringRef prettyPlatformString(PlatformKind platform);

Expand Down
2 changes: 1 addition & 1 deletion include/swift/Basic/LangOptions.h
Expand Up @@ -130,7 +130,7 @@ namespace swift {
/// This is for testing purposes.
std::string DebugForbidTypecheckPrefix;

/// Number of paralellel processes performing AST verification.
/// Number of parallel processes performing AST verification.
unsigned ASTVerifierProcessCount = 1U;

/// ID of the current process for the purposes of AST verification.
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Driver/DependencyGraph.h
Expand Up @@ -94,7 +94,7 @@ class DependencyGraphImpl {
static_assert(std::is_move_constructible<ProvidesEntryTy>::value, "");

/// The "outgoing" edge map. This lists all outgoing (kind, string) edges
/// representing satisified dependencies from a particular node.
/// representing satisfied dependencies from a particular node.
///
/// For multiple outgoing edges with the same string, the kinds are combined
/// into one field.
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Driver/ToolChain.h
Expand Up @@ -131,7 +131,7 @@ class ToolChain {
const llvm::opt::ArgList &args,
const OutputInfo &OI) const;

/// Return the default langauge type to use for the given extension.
/// Return the default language type to use for the given extension.
virtual types::ID lookupTypeForExtension(StringRef Ext) const;
};
} // end namespace driver
Expand Down
2 changes: 1 addition & 1 deletion include/swift/IDE/CodeCompletion.h
Expand Up @@ -732,7 +732,7 @@ struct SimpleCachingCodeCompletionConsumer : public CodeCompletionConsumer {
ArrayRef<RequestedCachedModule> requestedModules,
DeclContext *DCForModules) override;

/// Clients should overrride this method to receive \p Results.
/// Clients should override this method to receive \p Results.
virtual void handleResults(
MutableArrayRef<CodeCompletionResult *> Results) = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion include/swift/SIL/SILInstruction.h
Expand Up @@ -807,7 +807,7 @@ class ApplyInstBase<Impl, Base, true>
/// The hope is that this will prevent any future bugs from coming up related
/// to this.
///
/// Self is always the last parameter, but self subtitutions are always
/// Self is always the last parameter, but self substitutions are always
/// first. The reason to add this method is to wrap that dichotomy to reduce
/// errors.
///
Expand Down
2 changes: 1 addition & 1 deletion include/swift/SIL/SILValue.h
Expand Up @@ -377,7 +377,7 @@ class Operand {
/// Hoist the address projection rooted in this operand to \p InsertBefore.
/// Requires the projected value to dominate the insertion point.
///
/// Will look through single basic block predeccessor arguments.
/// Will look through single basic block predecessor arguments.
void hoistAddressProjections(SILInstruction *InsertBefore,
DominanceInfo *DomTree);

Expand Down
2 changes: 1 addition & 1 deletion include/swift/SIL/SILValueProjection.h
Expand Up @@ -127,7 +127,7 @@ class SILValueProjection {
return Path.getValue().hasNonEmptySymmetricDifference(P);
}

/// Substract the given path from the ProjectionPath.
/// Subtract the given path from the ProjectionPath.
void subtractPaths(Optional<ProjectionPath> &P) {
if (!P.hasValue())
return;
Expand Down
2 changes: 1 addition & 1 deletion include/swift/SIL/TypeSubstCloner.h
Expand Up @@ -278,7 +278,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
TypeSubstitutionMap &SubsMap;
/// The original function to specialize.
SILFunction &Original;
/// The substiutions used at the call site.
/// The substitutions used at the call site.
ArrayRef<Substitution> ApplySubs;
/// True, if used for inlining.
bool Inlining;
Expand Down
4 changes: 2 additions & 2 deletions include/swift/SILOptimizer/Analysis/BottomUpIPAnalysis.h
Expand Up @@ -71,7 +71,7 @@ class BottomUpIPAnalysis : public SILAnalysis {
private:

/// The list of callers which must be invalidated if this function gets
/// invalidated. Note that the list may contain invlid entries for already
/// invalidated. Note that the list may contain invalid entries for already
/// invalidated callers. Those entries are removed lazily in
/// removeInvalidCallers().
/// The lazy removal of invalid entries avoids that we additionally need to
Expand Down Expand Up @@ -232,7 +232,7 @@ class BottomUpIPAnalysis : public SILAnalysis {
/// Should be called after visiting \p FInfo during recomputation.
void tryToSchedule(FunctionInfo *FInfo) {
assert(FInfo->isVisited() &&
"tryied to schedule function which was not visited");
"tried to schedule function which was not visited");
assert(!FInfo->isScheduled() &&
"function scheduled multiple times");
if (FInfo->numUnscheduledCallees == 0) {
Expand Down
2 changes: 1 addition & 1 deletion include/swift/SILOptimizer/Analysis/EscapeAnalysis.h
Expand Up @@ -66,7 +66,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {

/// Represents the "memory content" to which a pointer points to.
/// The "content" represents all stored properties of the referenced object.
/// We also treat the elements of a referece-counted object as a "content"
/// We also treat the elements of a reference-counted object as a "content"
/// of that object. Although ref_element_addr is just a pointer addition, we
/// treat it as a "pointer" pointing to the elements. Having this additional
/// indirection in the graph, we avoid letting a reference escape just
Expand Down
4 changes: 2 additions & 2 deletions include/swift/SILOptimizer/Analysis/SideEffectAnalysis.h
Expand Up @@ -177,7 +177,7 @@ class SideEffectAnalysis : public BottomUpIPAnalysis {
/// Can this function trap or exit the program in any way?
bool Traps = false;

/// Does this function read a refernce count other than with retain or
/// Does this function read a reference count other than with retain or
/// release instructions, e.g. isUnique?
bool ReadsRC = false;

Expand Down Expand Up @@ -230,7 +230,7 @@ class SideEffectAnalysis : public BottomUpIPAnalysis {
/// Can this function trap or exit the program in any way?
bool mayTrap() const { return Traps; }

/// Does this function read a refernce count other than with retain or
/// Does this function read a reference count other than with retain or
/// release instructions, e.g. isUnique?
bool mayReadRC() const { return ReadsRC; }

Expand Down
2 changes: 1 addition & 1 deletion include/swift/SILOptimizer/PassManager/Passes.def
Expand Up @@ -91,7 +91,7 @@ PASS(FunctionSignatureOpts, "function-signature-opts",
"Optimize Function Signatures")
PASS(ARCSequenceOpts, "arc-sequence-opts",
"Optimize sequences of retain/release opts by removing redundant inner "
"retain/release sqeuences")
"retain/release sequences")
PASS(ARCLoopOpts, "arc-loop-opts",
"Run all arc loop passes")
PASS(RedundantLoadElimination, "redundant-load-elim",
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Sema/IterativeTypeChecker.h
Expand Up @@ -33,7 +33,7 @@ class TypeChecker;
/// An iterative type checker that processes type check requests to
/// ensure that the AST has the information needed by the client.
class IterativeTypeChecker {
/// The underyling (non-iterative) type checker on which this iterative
/// The underlying (non-iterative) type checker on which this iterative
/// type checker depends.
///
/// Each dependency on the non-iterative type checker potentially
Expand Down
2 changes: 1 addition & 1 deletion lib/AST/Decl.cpp
Expand Up @@ -2285,7 +2285,7 @@ bool ClassDecl::inheritsSuperclassInitializers(LazyResolver *resolver) {
}

// All of the direct superclass's designated initializers have been overridden
// by the sublcass. Initializers can be inherited.
// by the subclass. Initializers can be inherited.
ClassDeclBits.InheritsSuperclassInits
= static_cast<unsigned>(StoredInheritsSuperclassInits::Inherited);
return true;
Expand Down
2 changes: 1 addition & 1 deletion lib/AST/ProtocolConformance.cpp
Expand Up @@ -642,7 +642,7 @@ DeclContext::getLocalProtocols(
nullptr,
diagnostics);

// Sort if requred.
// Sort if required.
if (sorted) {
llvm::array_pod_sort(result.begin(), result.end(),
&ProtocolType::compareProtocols);
Expand Down
2 changes: 1 addition & 1 deletion lib/Driver/ToolChains.cpp
@@ -1,4 +1,4 @@
//===--- ToolChains.cpp - Job invocations (general and per-plaftorm) ------===//
//===--- ToolChains.cpp - Job invocations (general and per-platform) ------===//
//
// This source file is part of the Swift.org open source project
//
Expand Down
2 changes: 1 addition & 1 deletion lib/IDE/CodeCompletionResultBuilder.h
Expand Up @@ -267,7 +267,7 @@ class CodeCompletionResultBuilder {
void addSimpleNamedParameter(StringRef name) {
CurrentNestingLevel++;
addSimpleChunk(CodeCompletionString::Chunk::ChunkKind::CallParameterBegin);
// Use internal, since we don't want the name to be outisde the placeholder.
// Use internal, since we don't want the name to be outside the placeholder.
addChunkWithText(
CodeCompletionString::Chunk::ChunkKind::CallParameterInternalName,
name);
Expand Down
2 changes: 1 addition & 1 deletion lib/IRGen/GenMeta.cpp
Expand Up @@ -3443,7 +3443,7 @@ namespace {
// NOTE: Unlike other bits of the metadata that should later be removed,
// this one is important because things check this value's flags to
// determine what kind of object it is. That said, if those checks
// are determined to be removeable, we can remove this as well per
// are determined to be removable, we can remove this as well per
// rdar://problem/18801263
assert(!ClassRODataPtrOffset.isInvalid());
Address rodataPtrSlot = createPointerSizedGEP(IGF, metadataPtr,
Expand Down
4 changes: 2 additions & 2 deletions lib/IRGen/GenObjC.cpp
Expand Up @@ -1098,15 +1098,15 @@ static llvm::Constant *getObjCEncodingForTypes(IRGenModule &IGM,
}

// Parameter types.
// TODO. Encode type qualifer, 'in', 'inout', etc. for the parameter.
// TODO. Encode type qualifier, 'in', 'inout', etc. for the parameter.
std::string paramsString;
for (auto param : params) {
auto clangType = IGM.getClangType(param.getType());
if (clangType.isNull())
return llvm::ConstantPointerNull::get(IGM.Int8PtrTy);

// TODO. Some stuff related to Array and Function type is missing.
// TODO. Encode type qualifer, 'in', 'inout', etc. for the parameter.
// TODO. Encode type qualifier, 'in', 'inout', etc. for the parameter.
HelperGetObjCEncodingForType(clangASTContext, clangType, paramsString,
useExtendedEncoding);
paramsString += llvm::itostr(parmOffset);
Expand Down
2 changes: 1 addition & 1 deletion lib/IRGen/GenProto.cpp
Expand Up @@ -431,7 +431,7 @@ static bool isNeverAllocated(FixedPacking packing) {
}

namespace {
/// An operation to be peformed for various kinds of packing.
/// An operation to be performed for various kinds of packing.
struct DynamicPackingOperation {
virtual ~DynamicPackingOperation() = default;

Expand Down
2 changes: 1 addition & 1 deletion lib/IRGen/IRGenDebugInfo.cpp
Expand Up @@ -1826,7 +1826,7 @@ static bool canMangle(TypeBase *Ty) {
switch (Ty->getKind()) {
case TypeKind::PolymorphicFunction: // Mangler crashes.
case TypeKind::GenericFunction: // Not yet supported.
case TypeKind::SILBlockStorage: // Not suported at all.
case TypeKind::SILBlockStorage: // Not supported at all.
case TypeKind::SILBox:
return false;
case TypeKind::InOut: {
Expand Down
2 changes: 1 addition & 1 deletion lib/LLVMPasses/LLVMARCOpts.cpp
Expand Up @@ -594,7 +594,7 @@ static DtorKind analyzeDestructor(Value *P) {
case RT_BridgeRetain: // x = swift_bridgeRetain(y)
case RT_Retain: { // swift_retain(obj)

// Ignore retains of the "self" object, no ressurection is possible.
// Ignore retains of the "self" object, no resurrection is possible.
Value *ThisRetainedObject = cast<CallInst>(I).getArgOperand(0);
if (ThisRetainedObject->stripPointerCasts() ==
ThisObject->stripPointerCasts())
Expand Down
6 changes: 3 additions & 3 deletions lib/Parse/ParseExpr.cpp
Expand Up @@ -436,7 +436,7 @@ ParserResult<Expr> Parser::parseExprUnary(Diag<> Message, bool isExprBasic) {

case tok::oper_postfix:
// Postfix operators cannot start a subexpression, but can happen
// syntactically because the operator may just follow whatever preceeds this
// syntactically because the operator may just follow whatever precedes this
// expression (and that may not always be an expression).
diagnose(Tok, diag::invalid_postfix_operator);
Tok.setKind(tok::oper_prefix);
Expand Down Expand Up @@ -630,14 +630,14 @@ static StringRef copyAndStripUnderscores(ASTContext &C, StringRef orig) {
/// the start of a trailing closure, or start the variable accessor block.
///
/// Check to see if the '{' is followed by a 'didSet' or a 'willSet' label,
/// possibly preceeded by attributes. If so, we disambiguate the parse as the
/// possibly preceded by attributes. If so, we disambiguate the parse as the
/// start of a get-set block in a variable definition (not as a trailing
/// closure).
static bool isStartOfGetSetAccessor(Parser &P) {
assert(P.Tok.is(tok::l_brace) && "not checking a brace?");

// The only case this can happen is if the accessor label is immediately after
// a brace (possibly preceeded by attributes). "get" is implicit, so it can't
// a brace (possibly preceded by attributes). "get" is implicit, so it can't
// be checked for. Conveniently however, get/set properties are not allowed
// to have initializers, so we don't have an ambiguity, we just have to check
// for observing accessors.
Expand Down
8 changes: 4 additions & 4 deletions lib/Parse/ParseSIL.cpp
Expand Up @@ -337,7 +337,7 @@ bool SILParser::parseVerbatim(StringRef name) {
bool SILParser::diagnoseProblems() {
// Check for any uses of basic blocks that were not defined.
if (!UndefinedBlocks.empty()) {
// FIXME: These are going to come out in nondeterminstic order.
// FIXME: These are going to come out in nondeterministic order.
for (auto Entry : UndefinedBlocks)
P.diagnose(Entry.second.first, diag::sil_undefined_basicblock_use,
Entry.second.second);
Expand All @@ -346,7 +346,7 @@ bool SILParser::diagnoseProblems() {
}

if (!ForwardRefLocalValues.empty()) {
// FIXME: These are going to come out in nondeterminstic order.
// FIXME: These are going to come out in nondeterministic order.
for (auto &Entry : ForwardRefLocalValues)
P.diagnose(Entry.second, diag::sil_use_of_undefined_value,
Entry.first());
Expand Down Expand Up @@ -1516,8 +1516,8 @@ bool getApplySubstitutionsFromParsed(
return false;
}

// FIXME: we work around canonicalization of PolymorphicFunctionType
// by generating GenericSignature and transforming the input, output
// FIXME: We work around the canonicalization of PolymorphicFunctionType
// by generating a GenericSignature and transforming the input, output
// types.
static GenericSignature *canonicalPolymorphicFunctionType(
PolymorphicFunctionType *Ty,
Expand Down
2 changes: 1 addition & 1 deletion lib/SIL/DynamicCasts.cpp
Expand Up @@ -591,7 +591,7 @@ namespace {
// FIXME: Upcasts between existential metatypes are not handled yet.
// We should generate for it:
// %openedSrcMetatype = open_existential srcMetatype
// init_existental dstMetatype, %openedSrcMetatype
// init_existential dstMetatype, %openedSrcMetatype
auto &srcTL = getTypeLowering(source.Value.getType());
SILValue value;
if (source.isAddress()) {
Expand Down
2 changes: 1 addition & 1 deletion lib/SIL/SILInstruction.cpp
Expand Up @@ -88,7 +88,7 @@ void llvm::ilist_traits<SILInstruction>::
transferNodesFromList(llvm::ilist_traits<SILInstruction> &L2,
llvm::ilist_iterator<SILInstruction> first,
llvm::ilist_iterator<SILInstruction> last) {
// If transfering instructions within the same basic block, no reason to
// If transferring instructions within the same basic block, no reason to
// update their parent pointers.
SILBasicBlock *ThisParent = getContainingBlock();
if (ThisParent == L2.getContainingBlock()) return;
Expand Down
2 changes: 1 addition & 1 deletion lib/SIL/SILValue.cpp
Expand Up @@ -210,7 +210,7 @@ void Operand::hoistAddressProjections(SILInstruction *InsertBefore,
while (true) {
SILValue Incoming = stripSinglePredecessorArgs(V);

// Forward the incoming arg from a single predeccessor.
// Forward the incoming arg from a single predecessor.
if (V != Incoming) {
if (V == get()) {
// If we are the operand itself set the operand to the incoming
Expand Down
2 changes: 1 addition & 1 deletion lib/SILGen/SILGenApply.cpp
Expand Up @@ -3467,7 +3467,7 @@ namespace {
// Special case for superclass method calls.
if (isPartiallyAppliedSuperMethod(uncurryLevel)) {
assert(uncurriedArgs.size() == 1 &&
"Can only partially apply the self parameater of a super method call");
"Can only partially apply the self parameter of a super method call");

auto constant = callee.getMethodName();
auto loc = uncurriedLoc.getValue();
Expand Down
2 changes: 1 addition & 1 deletion lib/SILGen/SILGenBridging.cpp
Expand Up @@ -805,7 +805,7 @@ static SILFunctionType *emitObjCThunkArguments(SILGenFunction &gen,

// If this parameter is deallocating, emit an unmanaged rvalue and
// continue. The object has the deallocating bit set so retain, release is
// irrelevent.
// irrelevant.
if (inputs[i].isDeallocating()) {
bridgedArgs.push_back(ManagedValue::forUnmanaged(arg));
continue;
Expand Down
4 changes: 2 additions & 2 deletions lib/SILGen/SILGenLValue.cpp
Expand Up @@ -1415,7 +1415,7 @@ void LValue::addOrigToSubstComponent(SILType loweredSubstType) {
assert(getTypeOfRValue() != loweredSubstType &&
"reabstraction component is unnecessary!");

// Peephole away complementary reabstractons.
// Peephole away complementary reabstractions.
assert(!Path.empty() && "adding translation component to empty l-value");
if (Path.back()->getKind() == PathComponent::SubstToOrigKind) {
// But only if the lowered type matches exactly.
Expand All @@ -1437,7 +1437,7 @@ void LValue::addSubstToOrigComponent(AbstractionPattern origType,
assert(getTypeOfRValue() != loweredSubstType &&
"reabstraction component is unnecessary!");

// Peephole away complementary reabstractons.
// Peephole away complementary reabstractions.
assert(!Path.empty() && "adding translation component to empty l-value");
if (Path.back()->getKind() == PathComponent::OrigToSubstKind) {
// But only if the lowered type matches exactly.
Expand Down