Revert "[OpenMP][FIX] Verify compatible types for declare variant calls"

This reverts commit c942095.

One of the tests broke, revert to investigate.

Author: jdoerfert

clang/lib/Sema/SemaOpenMP.cpp

@@ -5921,6 +5921,7 @@ void Sema::ActOnStartOfFunctionDefinitionInOpenMPDeclareVariantScope(
       continue;
 
     QualType UDeclTy = UDecl->getType();
+    // TODO: Verify types for templates eventually.
     if (!UDeclTy->isDependentType()) {
       QualType NewType = Context.mergeFunctionTypes(
           FType, UDeclTy, /* OfBlockPointer */ false,
@@ -6008,8 +6009,6 @@ ExprResult Sema::ActOnOpenMPCall(ExprResult Call, Scope *Scope,
   TargetOMPContext OMPCtx(Context, std::move(DiagUnknownTrait),
                           getCurFunctionDecl());
 
-  QualType CalleeFnType = CalleeFnDecl->getType();
-
   SmallVector<Expr *, 4> Exprs;
   SmallVector<VariantMatchInfo, 4> VMIs;
   while (CalleeFnDecl) {
@@ -6062,19 +6061,8 @@ ExprResult Sema::ActOnOpenMPCall(ExprResult Call, Scope *Scope,
       }
       NewCall = BuildCallExpr(Scope, BestExpr, LParenLoc, ArgExprs, RParenLoc,
                               ExecConfig);
-      if (NewCall.isUsable()) {
-        if (CallExpr *NCE = dyn_cast<CallExpr>(NewCall.get())) {
-          FunctionDecl *NewCalleeFnDecl = NCE->getDirectCallee();
-          QualType NewType = Context.mergeFunctionTypes(
-              CalleeFnType, NewCalleeFnDecl->getType(),
-              /* OfBlockPointer */ false,
-              /* Unqualified */ false, /* AllowCXX */ true);
-          if (!NewType.isNull())
-            break;
-          // Don't use the call if the function type was not compatible.
-          NewCall = nullptr;
-        }
-      }
+      if (NewCall.isUsable())
+        break;
     }
 
     VMIs.erase(VMIs.begin() + BestIdx);

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -444,12 +444,6 @@ static void instantiateOMPDeclareVariantAttr(
                                                          New->getLocation());
         if (!SubstFD)
           return;
-        QualType NewType = S.Context.mergeFunctionTypes(
-            SubstFD->getType(), FD->getType(),
-            /* OfBlockPointer */ false,
-            /* Unqualified */ false, /* AllowCXX */ true);
-        if (NewType.isNull())
-          return;
         S.InstantiateFunctionDefinition(
             New->getLocation(), SubstFD, /* Recursive */ true,
             /* DefinitionRequired */ false, /* AtEndOfTU */ false);