diff options
| author | Vedant Kumar <vsk@apple.com> | 2018-06-26 03:53:06 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2018-06-26 03:53:06 +0000 |
| commit | d4b57547051f0bd30420c8e53dc46566c70de30f (patch) | |
| tree | 6ca3caf8975831b22799e34d77f3d07da1e8977f /lib/Sema/SemaLambda.cpp | |
| parent | f759bf6afbe728cf398cda332ad74b9a424f9a4f (diff) | |
Fix an ambiguous overload issue pointed out by MSVC
Log:
http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/11390
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@335577 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaLambda.cpp')
| -rw-r--r-- | lib/Sema/SemaLambda.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaLambda.cpp b/lib/Sema/SemaLambda.cpp index 98b428b089..fcacc2a17c 100644 --- a/lib/Sema/SemaLambda.cpp +++ b/lib/Sema/SemaLambda.cpp @@ -712,7 +712,8 @@ void Sema::deduceClosureReturnType(CapturingScopeInfo &CSI) { auto RetTyNullability = ReturnType->getNullability(Ctx); auto BlockNullability = CSI.ReturnType->getNullability(Ctx); if (BlockNullability && - (!RetTyNullability || *RetTyNullability < *BlockNullability)) + (!RetTyNullability || + hasWeakerNullability(*RetTyNullability, *BlockNullability))) CSI.ReturnType = ReturnType; continue; } |