Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
Bob Wilson
2016-10-27 22:28:28 -07:00
377 changed files with 10818 additions and 6806 deletions

View File

@@ -2671,6 +2671,7 @@ static uint8_t getRawStableSILFunctionTypeRepresentation(
SIMPLE_CASE(SILFunctionTypeRepresentation, Method)
SIMPLE_CASE(SILFunctionTypeRepresentation, ObjCMethod)
SIMPLE_CASE(SILFunctionTypeRepresentation, WitnessMethod)
SIMPLE_CASE(SILFunctionTypeRepresentation, Closure)
}
llvm_unreachable("bad calling convention");
}