[Refactoring] Add some calls to getSemanticsProvidingExpr

Author: hamishknight

lib/IDE/Refactoring.cpp

@@ -4466,6 +4466,7 @@ struct CallbackCondition {
   CallbackCondition(const BinaryExpr *BE, const FuncDecl *Operator) {
     bool FoundNil = false;
     for (auto *Operand : BE->getArg()->getElements()) {
+      Operand = Operand->getSemanticsProvidingExpr();
       if (isa<NilLiteralExpr>(Operand)) {
         FoundNil = true;
       } else if (auto *DRE = dyn_cast<DeclRefExpr>(Operand)) {
@@ -4912,9 +4913,9 @@ struct CallbackClassifier {
         Exprs.push_back(BoolExpr);
 
         while (!Exprs.empty()) {
-          auto *Next = Exprs.pop_back_val();
+          auto *Next = Exprs.pop_back_val()->getSemanticsProvidingExpr();
           if (auto *ACE = dyn_cast<AutoClosureExpr>(Next))
-            Next = ACE->getSingleExpressionBody();
+            Next = ACE->getSingleExpressionBody()->getSemanticsProvidingExpr();
 
           if (auto *BE = dyn_cast_or_null<BinaryExpr>(Next)) {
             auto *Operator = isOperator(BE);

test/refactoring/ConvertAsync/convert_params_single.swift

@@ -313,7 +313,7 @@ withError { res, err in
 // RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=UNBOUND %s
 withError { res, err in
   print("before")
-  if res != nil && err == nil {
+  if ((res != (nil)) && err == nil) {
     print("got result \(res!)")
   } else {
     print("got error \(err!)")