Merge pull request #6297 from slavapestov/fix-nits

slavapestov · web-flow · commit 2d3c2ffbe698 · 2016-12-14T23:21:35.000-08:00
Fix nits
diff --git a/lib/AST/Availability.cpp b/lib/AST/Availability.cpp
@@ -188,7 +188,7 @@ class AvailabilityInferenceTypeWalker : public TypeWalker {
   AvailabilityInferenceTypeWalker(ASTContext &AC) : AC(AC) {}
 
   virtual Action walkToTypePre(Type ty) {
-    if (auto *nominalDecl = ty.getCanonicalTypeOrNull().getAnyNominal()) {
+    if (auto *nominalDecl = ty->getCanonicalType()->getAnyNominal()) {
       AvailabilityInfo.intersectWith(
           AvailabilityInference::availableRange(nominalDecl, AC));
     }
diff --git a/lib/SILGen/SILGenBridging.cpp b/lib/SILGen/SILGenBridging.cpp
@@ -891,7 +891,6 @@ static SILFunctionType *emitObjCThunkArguments(SILGenFunction &gen,
                               Optional<ForeignErrorConvention> &foreignError) {
   SILDeclRef native = thunk.asForeign(false);
 
-  auto mod = gen.SGM.M.getSwiftModule();
   auto subs = gen.F.getForwardingSubstitutions();
 
   auto objcInfo = gen.SGM.Types.getConstantInfo(thunk);

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ class AvailabilityInferenceTypeWalker : public TypeWalker {`
`188`	`188`	`AvailabilityInferenceTypeWalker(ASTContext &AC) : AC(AC) {}`
`189`	`189`
`190`	`190`	`virtual Action walkToTypePre(Type ty) {`
`191`		`- if (auto *nominalDecl = ty.getCanonicalTypeOrNull().getAnyNominal()) {`
	`191`	`+ if (auto *nominalDecl = ty->getCanonicalType()->getAnyNominal()) {`
`192`	`192`	`AvailabilityInfo.intersectWith(`
`193`	`193`	`AvailabilityInference::availableRange(nominalDecl, AC));`
`194`	`194`	`}`