Merge pull request #1403 from practicalswift/typo-fixes-20160223

[gardening] Fix recently introduced typos: "a empty" → "an empty", "abstruction" → "abstraction"

Author: gribozavr

lib/ClangImporter/ImportType.cpp

@@ -1870,7 +1870,7 @@ DefaultArgumentKind ClangImporter::Implementation::inferDefaultArgument(
     }
   }
 
-  // Don't introduce a empty options default arguments for setters.
+  // Don't introduce an empty options default arguments for setters.
   if (isFirstParameter && camel_case::getFirstWord(baseName.str()) == "set")
     return DefaultArgumentKind::None;
 

lib/SILOptimizer/Utils/Generics.cpp

@@ -390,13 +390,13 @@ SILFunction *swift::getExistingSpecialization(SILModule &M,
   return Specialization;
 }
 
-/// Create a re-abstruction thunk for a partial_apply.
+/// Create a re-abstraction thunk for a partial_apply.
 /// This is needed in case we converted some parameters/results of the
 /// specialized function from indirect to direct but the result function of the
 /// partial_apply still needs them as indirect.
 /// We create a thunk which converts the direct parameters/results back to
 /// indirect ones.
-static SILFunction *createReabstructionThunk(const ReabstractionInfo &ReInfo,
+static SILFunction *createReabstractionThunk(const ReabstractionInfo &ReInfo,
                                      PartialApplyInst *OrigPAI,
                                      SILFunction *SpecializedFunc) {
   SILFunction *OrigF = OrigPAI->getCalleeFunction();
@@ -591,7 +591,7 @@ void swift::trySpecializeApplyOfGeneric(ApplySite Apply,
     // original function with indirect parameters/results.
     auto *PAI = cast<PartialApplyInst>(Apply.getInstruction());
     SILBuilderWithScope Builder(PAI);
-    SILFunction *Thunk = createReabstructionThunk(ReInfo, PAI, SpecializedF);
+    SILFunction *Thunk = createReabstractionThunk(ReInfo, PAI, SpecializedF);
     NewFunctions.push_back(Thunk);
     auto *FRI = Builder.createFunctionRef(PAI->getLoc(), Thunk);
     SmallVector<SILValue, 4> Arguments;

test/SILOptimizer/specialize_partial_apply.swift

@@ -14,7 +14,7 @@ struct MyError : ErrorType {
 	}
 }
 
-// We need a reabstruction thunk to convert from direct args/result to indirect
+// We need a reabstraction thunk to convert from direct args/result to indirect
 // args/result, which is expected in the returned closure.
 
 // CHECK-LABEL: sil shared [noinline] @_TTSg5Si___TF4test16generic_get_funcurFTxSb_Fxx : $@convention(thin) (Int, Bool) -> @owned @callee_owned (@in Int) -> @out Int {
@@ -85,7 +85,7 @@ func testit3(b: Bool) -> Int {
 
 // The same three test cases again, but with throwing functions.
 
-// We need a reabstruction thunk to convert from direct args/result to indirect
+// We need a reabstraction thunk to convert from direct args/result to indirect
 // args/result, which is expected in the returned closure.
 
 // CHECK-LABEL: sil shared [noinline] @_TTSg5Si___TF4test25generic_get_func_throwingurFSbFzxx : $@convention(thin) (Bool) -> @owned @callee_owned (@in Int) -> (@out Int, @error ErrorType) {