diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -6005,6 +6005,15 @@ if (TSK == TSK_ImplicitInstantiation && !ClassAttr->isInherited()) continue; + // If this is an MS ABI dllexport default constructor, instantiate any + // default arguments. + if (S.Context.getTargetInfo().getCXXABI().isMicrosoft()) { + auto CD = dyn_cast(MD); + if (CD && CD->isDefaultConstructor() && TSK == TSK_Undeclared) { + S.InstantiateDefaultCtorDefaultArgs(CD); + } + } + S.MarkFunctionReferenced(Class->getLocation(), MD); // The function will be passed to the consumer when its definition is diff --git a/clang/test/CodeGenCXX/dllexport-ctor-closure-nested.cpp b/clang/test/CodeGenCXX/dllexport-ctor-closure-nested.cpp new file mode 100644 --- /dev/null +++ b/clang/test/CodeGenCXX/dllexport-ctor-closure-nested.cpp @@ -0,0 +1,20 @@ +// RUN: %clang_cc1 -triple i686-windows-msvc -emit-llvm -std=c++14 \ +// RUN: -fno-threadsafe-statics -fms-extensions -O1 -mconstructor-aliases \ +// RUN: -disable-llvm-passes -o - %s -w -fms-compatibility-version=19.00 | \ +// RUN: FileCheck %s + +struct HasDtor { + ~HasDtor(); + int o; +}; +struct HasImplicitDtor1 { + HasDtor o; +}; +struct __declspec(dllexport) CtorClosureOuter { + struct __declspec(dllexport) CtorClosureInner { + CtorClosureInner(const HasImplicitDtor1 &v = {}) {} + }; +}; + +// CHECK-LABEL: $"??1HasImplicitDtor1@@QAE@XZ" = comdat any +// CHECK-LABEL: define weak_odr dso_local dllexport x86_thiscallcc void @"??_FCtorClosureInner@CtorClosureOuter@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat diff --git a/utils/arcanist/clang-format.sh b/utils/arcanist/clang-format.sh --- a/utils/arcanist/clang-format.sh +++ b/utils/arcanist/clang-format.sh @@ -12,6 +12,8 @@ # advice severity level is completely non-disruptive. # switch to warning or error if you want to prompt the user. +export PATH=$PATH:/d/Test/llvm/build/Release/bin + if ! hash clang-format >/dev/null; then echo "advice" echo "clang-format not found in user’s local PATH; not linting file."