diff --git a/clang/lib/Sema/SemaAttr.cpp b/clang/lib/Sema/SemaAttr.cpp
index 479f47962a7c3..44485e71d57a0 100644
--- a/clang/lib/Sema/SemaAttr.cpp
+++ b/clang/lib/Sema/SemaAttr.cpp
@@ -1310,6 +1310,8 @@ void Sema::AddOptnoneAttributeIfNoConflicts(FunctionDecl *FD,
 }
 
 void Sema::AddImplicitMSFunctionNoBuiltinAttr(FunctionDecl *FD) {
+  if (FD->isDeleted() || FD->isDefaulted())
+    return;
   SmallVector<StringRef> V(MSFunctionNoBuiltins.begin(),
                            MSFunctionNoBuiltins.end());
   if (!MSFunctionNoBuiltins.empty())
diff --git a/clang/test/SemaCXX/msvc-pragma-function-no-builtin-attr.cpp b/clang/test/SemaCXX/msvc-pragma-function-no-builtin-attr.cpp
new file mode 100644
index 0000000000000..cd2ac7d1edbef
--- /dev/null
+++ b/clang/test/SemaCXX/msvc-pragma-function-no-builtin-attr.cpp
@@ -0,0 +1,32 @@
+// RUN: %clang_cl -fms-compatibility -Xclang -ast-dump -fsyntax-only %s | FileCheck %s
+
+extern "C" __inline float __cdecl fabsf(  float _X);
+// CHECK: FunctionDecl {{.*}} fabsf
+#pragma function(fabsf)
+  __inline float __cdecl fabsf(  float _X)
+{
+    return 0;
+}
+// CHECK: FunctionDecl {{.*}} fabsf
+// CHECK: NoBuiltinAttr {{.*}} <<invalid sloc>> Implicit fabsf
+
+int bar() {
+  return 0;
+}
+// CHECK: FunctionDecl {{.*}} bar
+// CHECK: NoBuiltinAttr {{.*}} <<invalid sloc>> Implicit fabsf
+
+struct A {
+    int foo() = delete;
+    // CHECK: CXXMethodDecl {{.*}} foo 'int ()' delete
+    // CHECK-NOT: NoBuiltinAttr
+    A() = default;
+    // CHECK: CXXConstructorDecl {{.*}} A 'void ()' default
+    // CHECK-NOT: NoBuiltinAttr
+};
+
+int main() {
+    return 0;
+}
+// CHECK: FunctionDecl {{.*}} main
+// CHECK: NoBuiltinAttr {{.*}} <<invalid sloc>> Implicit fabsf