Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/IRGen/GenClangDecl.cpp

@@ -113,6 +113,17 @@ IRGenModule::getAddrOfClangGlobalDecl(clang::GlobalDecl global,
 }
 
 void IRGenModule::finalizeClangCodeGen() {
+  // Ensure that code is emitted for any `PragmaCommentDecl`s. (These are
+  // always guaranteed to be directly below the TranslationUnitDecl.)
+  // In Clang, this happens automatically during the Sema phase, but here we
+  // need to take care of it manually because our Clang CodeGenerator is not
+  // attached to Clang Sema as an ASTConsumer.
+  for (const auto *D : ClangASTContext->getTranslationUnitDecl()->decls()) {
+    if (const auto *PCD = dyn_cast<clang::PragmaCommentDecl>(D)) {
+      emitClangDecl(PCD);
+    }
+  }
+
   ClangCodeGen->HandleTranslationUnit(
       *const_cast<clang::ASTContext *>(ClangASTContext));
 }

lib/IRGen/GenClass.cpp

@@ -813,24 +813,24 @@ llvm::Value *irgen::emitClassAllocation(IRGenFunction &IGF, SILType selfType,
   auto &classLayout = classTI.getClassLayout(IGF.IGM, selfType,
                                              /*forBackwardDeployment=*/false);
 
-  llvm::Value *size, *alignMask;
-  if (classLayout.isFixedSize()) {
-    size = IGF.IGM.getSize(classLayout.getSize());
-    alignMask = IGF.IGM.getSize(classLayout.getAlignMask());
-  } else {
-    std::tie(size, alignMask)
-      = emitClassResilientInstanceSizeAndAlignMask(IGF,
-                                     selfType.getClassOrBoundGenericClass(),
-                                     metadata);
-  }
-
   llvm::Type *destType = classLayout.getType()->getPointerTo();
   llvm::Value *val = nullptr;
   if (llvm::Value *Promoted = stackPromote(IGF, classLayout, StackAllocSize,
                                            TailArrays)) {
     val = IGF.Builder.CreateBitCast(Promoted, IGF.IGM.RefCountedPtrTy);
     val = IGF.emitInitStackObjectCall(metadata, val, "reference.new");
   } else {
+    llvm::Value *size, *alignMask;
+    if (classLayout.isFixedSize()) {
+      size = IGF.IGM.getSize(classLayout.getSize());
+      alignMask = IGF.IGM.getSize(classLayout.getAlignMask());
+    } else {
+      std::tie(size, alignMask)
+        = emitClassResilientInstanceSizeAndAlignMask(IGF,
+                                       selfType.getClassOrBoundGenericClass(),
+                                       metadata);
+    }
+
     // Allocate the object on the heap.
     std::tie(size, alignMask)
       = appendSizeForTailAllocatedArrays(IGF, size, alignMask, TailArrays);

test/IRGen/Inputs/autolink-coff-c-pragma-transitive.h

@@ -0,0 +1 @@
+#pragma comment(lib, "transitive-module")

test/IRGen/Inputs/autolink-coff-c-pragma.h

@@ -0,0 +1,3 @@
+#include "autolink-coff-c-pragma-transitive.h"
+
+#pragma comment(lib, "module")

test/IRGen/Inputs/module.modulemap

@@ -0,0 +1,9 @@
+module AutolinkCoffCPragma {
+  header "autolink-coff-c-pragma.h"
+  export *
+}
+
+module AutolinkCoffCPragmaTransitive {
+  header "autolink-coff-c-pragma-transitive.h"
+  export *
+}

test/IRGen/autolink-coff-c-pragma.swift

@@ -0,0 +1,20 @@
+// Tests that a `#pragma comment(lib, ...)` in a C header imported as a module
+// causes a corresponding `/DEFAULTLIB` directive to be emitted.
+//
+// We test that this is true also for C headers included transitively from
+// another C header.
+
+// RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -I %S/Inputs -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=CHECK-MSVC-IR
+// RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -I %S/Inputs -S %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=CHECK-MSVC-ASM
+
+// REQUIRES: CODEGENERATOR=X86
+
+import AutolinkCoffCPragma
+
+// CHECK-MSVC-IR: !llvm.linker.options = !{!{{[0-9]+}}, !{{[0-9]+}}}
+// CHECK-MSVC-IR-DAG: !{{[0-9]+}} = !{!"/DEFAULTLIB:module.lib"}
+// CHECK-MSVC-IR-DAG: !{{[0-9]+}} = !{!"/DEFAULTLIB:transitive-module.lib"}
+
+// CHECK-MSVC-ASM: .section .drectve
+// CHECK-MSVC-ASM-DAG: .ascii " /DEFAULTLIB:module.lib"
+// CHECK-MSVC-ASM-DAG: .ascii " /DEFAULTLIB:transitive-module.lib"