Merge pull request #5215 from bob-wilson/more-clang-fixes

More fixes for crashes when building with a recent clang.

Author: bob-wilson

lib/Parse/ParseSIL.cpp

@@ -117,7 +117,7 @@ namespace {
     llvm::StringMap<SourceLoc> ForwardRefLocalValues;
 
     /// A callback to be invoked every time a type was deserialized.
-    llvm::function_ref<void(Type)> ParsedTypeCallback;
+    std::function<void(Type)> ParsedTypeCallback;
 
 
     bool performTypeLocChecking(TypeLoc &T, bool IsSILType,

lib/SILOptimizer/IPO/EagerSpecializer.cpp

@@ -120,9 +120,9 @@ static void addReturnValueImpl(SILBasicBlock *RetBB, SILBasicBlock *NewRetBB,
   }
   // Create a CFG edge from NewRetBB to MergedBB.
   Builder.setInsertionPoint(NewRetBB);
-  ArrayRef<SILValue> BBArgs;
+  SmallVector<SILValue, 1> BBArgs;
   if (!NewRetVal->getType().isVoid())
-    BBArgs = NewRetVal;
+    BBArgs.push_back(NewRetVal);
   Builder.createBranch(Loc, MergedBB, BBArgs);
 }