diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -6574,24 +6574,20 @@
         CGOpenMPRuntime::getSingleCompoundChild(CGF.getContext(), Body);
     if (const auto *NestedDir =
             dyn_cast_or_null<OMPExecutableDirective>(ChildStmt)) {
-      if (isOpenMPTeamsDirective(NestedDir->getDirectiveKind())) {
-        if (NestedDir->hasClausesOfKind<OMPNumTeamsClause>()) {
-          CGOpenMPInnerExprInfo CGInfo(CGF, *CS);
-          CodeGenFunction::CGCapturedStmtRAII CapInfoRAII(CGF, &CGInfo);
-          const Expr *NumTeams =
-              NestedDir->getSingleClause<OMPNumTeamsClause>()->getNumTeams();
-          llvm::Value *NumTeamsVal =
-              CGF.EmitScalarExpr(NumTeams,
-                                 /*IgnoreResultAssign*/ true);
-          return Bld.CreateIntCast(NumTeamsVal, CGF.Int32Ty,
-                                   /*isSigned=*/true);
-        }
-        return Bld.getInt32(0);
-      }
-      if (isOpenMPParallelDirective(NestedDir->getDirectiveKind()) ||
-          isOpenMPSimdDirective(NestedDir->getDirectiveKind()))
+      if (isOpenMPTeamsDirective(NestedDir->getDirectiveKind()) &&
+          NestedDir->hasClausesOfKind<OMPNumTeamsClause>()) {
+        CGOpenMPInnerExprInfo CGInfo(CGF, *CS);
+        CodeGenFunction::CGCapturedStmtRAII CapInfoRAII(CGF, &CGInfo);
+        const Expr *NumTeams =
+            NestedDir->getSingleClause<OMPNumTeamsClause>()->getNumTeams();
+        llvm::Value *NumTeamsVal =
+            CGF.EmitScalarExpr(NumTeams,
+                               /*IgnoreResultAssign*/ true);
+        return Bld.CreateIntCast(NumTeamsVal, CGF.Int32Ty,
+                                 /*isSigned=*/true);
+      } else if (isOpenMPParallelDirective(NestedDir->getDirectiveKind()) ||
+                 isOpenMPSimdDirective(NestedDir->getDirectiveKind()))
         return Bld.getInt32(1);
-      return Bld.getInt32(0);
     }
     return nullptr;
   }