Merge remote-tracking branch 'origin/master' into merge-2.110

Author: kinke

.cirrus.yml

@@ -202,7 +202,7 @@ install_ubuntu_prerequisites_template: &INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
 environment:
   CIRRUS_CLONE_DEPTH: 50
   HOST_LDC_VERSION: 1.31.0
-  LLVM_VERSION: 18.1.6
+  LLVM_VERSION: 18.1.8
   GITHUB_TOKEN: ENCRYPTED[0955bd48c8d4e5391446fc0149d0719ad0b63df27ec9e6c180a5730a5b10dc7f28f09d1383423db158d21380ee2b022a]
 
 task:

.github/actions/1-setup/action.yml

@@ -110,7 +110,8 @@ runs:
     - name: Install D host compiler
       uses: dlang-community/setup-dlang@v1
       with:
-        compiler: ldc-latest
+        # macOS arm64: use LDC v1.39.0 using LLVM v17, as Xcode v16
+        compiler: ${{ inputs.arch == 'arm64' && 'ldc-1.39.0' || 'ldc-latest' }}
     - name: 'Posix: Clear LD_LIBRARY_PATH env variable' # don't use host druntime/Phobos .so/.dylib etc.
       if: runner.os != 'Windows'
       shell: bash

.github/workflows/main.yml

@@ -11,7 +11,7 @@ concurrency:
 
 env:
   CLANG_VERSION: 15.0.6
-  LLVM_VERSION: 18.1.6
+  LLVM_VERSION: 18.1.8
 
 jobs:
   build-native:
@@ -62,7 +62,6 @@ jobs:
               -DD_COMPILER_FLAGS="-gcc=/usr/bin/c++ -O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
-            llvm_version: 17.0.6 # FIXME: sporadic 'libc++abi: Pure virtual function called!' compiler crashes with LLVM 18 (see https://github.com/ldc-developers/ldc/pull/4604, https://github.com/ldc-developers/ldc/pull/4541)
 
           - job_name: Windows x64
             os: windows-2022
@@ -95,20 +94,26 @@ jobs:
         with:
           submodules: true
           fetch-depth: 50
-      - name: 'macOS 14: Switch to Xcode v14.3.1'
+      - name: 'macOS 14: Switch to Xcode 16 Beta 4'
         if: matrix.os == 'macos-14'
-        run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_16_beta_4.app
       - name: Install prerequisites
         uses: ./.github/actions/1-setup
         with:
-          clang_version: ${{ runner.os == 'Windows' && '18.1.6' || env.CLANG_VERSION }}
+          clang_version: ${{ runner.os == 'Windows' && '18.1.8' || env.CLANG_VERSION }}
           llvm_version: ${{ matrix.llvm_version || env.LLVM_VERSION }}
           arch: ${{ matrix.arch }}
       - name: Build bootstrap LDC
+        if: matrix.os != 'macos-14'
         uses: ./.github/actions/2-build-bootstrap
         with:
           cmake_flags: ${{ matrix.bootstrap_cmake_flags }}
           arch: ${{ matrix.arch }}
+      # FIXME: on macOS arm64, LLVM 18 (from LDC) and LLVM 17 (from Xcode 16) seem incompatible,
+      #        leading to sporadic 'libc++abi: Pure virtual function called!' compiler crashes
+      - name: 'macOS 14: Use host LDC (with Xcode-compatible LLVM version) as bootstrap LDC'
+        if: matrix.os == 'macos-14'
+        run: ln -s $(dirname $(dirname $(which ldmd2))) ../bootstrap-ldc
       - name: Build LDC with PGO instrumentation & gather profile from compiling default libs
         if: matrix.with_pgo
         uses: ./.github/actions/2a-build-pgo

.github/workflows/supported_llvm_versions.yml

@@ -19,7 +19,7 @@ jobs:
             os: ubuntu-20.04
             host_dc: ldc-1.19.0
             # FIXME: no usable official package available yet
-            llvm_version: https://github.com/ldc-developers/llvm-project/releases/download/ldc-v18.1.6/llvm-18.1.6-linux-x86_64.tar.xz
+            llvm_version: https://github.com/ldc-developers/llvm-project/releases/download/ldc-v18.1.8/llvm-18.1.8-linux-x86_64.tar.xz
             cmake_flags: -DRT_SUPPORT_SANITIZERS=ON
           - job_name: macOS 14, LLVM 17, latest LDC beta
             os: macos-14

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 #### Big news
 - Frontend, druntime and Phobos are at version [2.110.0](https://dlang.org/changelog/2.110.0.html). (#4707)
+- LLVM for prebuilt packages bumped to v18.1.8 (incl. macOS arm64). (#4712)
 - Android: NDK for prebuilt package bumped from r26d to r27. (#4711)
+- ldc2.conf: %%ldcconfigpath%% placeholder added - specifies the directory where current configuration file is located. (#4717)
 
 #### Platform support
 

driver/configfile.d

@@ -18,7 +18,7 @@ import core.stdc.stdio;
 import core.stdc.string;
 
 
-string prepareBinDir(const(char)* binDir)
+string normalizeSlashes(const(char)* binDir)
 {
     immutable len = strlen(binDir);
     auto res = binDir[0 .. len].dup;
@@ -96,6 +96,26 @@ unittest
     assert(replace(test4, pattern, "word") == "a word, yet other words");
 }
 
+struct CfgPaths
+{
+    string cfgBaseDir; /// ldc2.conf directory
+    string ldcBinaryDir; /// ldc2.exe binary dir
+
+    this(const(char)* cfPath, const(char)* binDir)
+    {
+        import dmd.root.filename: FileName;
+
+        cfgBaseDir = normalizeSlashes(FileName.path(cfPath));
+        ldcBinaryDir = normalizeSlashes(binDir);
+    }
+}
+
+string replacePlaceholders(string str, CfgPaths cfgPaths)
+{
+    return str
+        .replace("%%ldcbinarypath%%", cfgPaths.ldcBinaryDir)
+        .replace("%%ldcconfigpath%%", cfgPaths.cfgBaseDir);
+}
 
 extern(C++) struct ConfigFile
 {
@@ -117,8 +137,7 @@ private:
     {
         switches.setDim(0);
         postSwitches.setDim(0);
-
-        immutable dBinDir = prepareBinDir(binDir);
+        const cfgPaths = CfgPaths(cfPath, binDir);
 
         try
         {
@@ -156,7 +175,7 @@ private:
                 output.reserve(input.vals.length);
                 foreach (sw; input.vals)
                 {
-                    const finalSwitch = sw.replace("%%ldcbinarypath%%", dBinDir) ~ '\0';
+                    const finalSwitch = sw.replacePlaceholders(cfgPaths) ~ '\0';
                     output.push(finalSwitch.ptr);
                 }
             }
@@ -168,7 +187,7 @@ private:
             applyArray(_libDirs, libDirs);
 
             if (auto rpath = findScalarSetting(sections, "rpath"))
-                this.rpathcstr = (rpath.val.replace("%%ldcbinarypath%%", dBinDir) ~ '\0').ptr;
+                this.rpathcstr = (rpath.val.replacePlaceholders(cfgPaths) ~ '\0').ptr;
 
             return true;
         }

driver/linker-msvc.cpp

@@ -292,8 +292,11 @@ int linkObjToBinaryMSVC(llvm::StringRef outputPath,
   std::string linker = opts::linker;
   if (linker.empty()) {
 #ifdef _WIN32
-    // default to lld-link.exe for LTO
-    linker = opts::isUsingLTO() ? "lld-link.exe" : "link.exe";
+    // Default to lld-link.exe for LTO, otherwise Microsoft's link.exe.
+    // Try not to accidentally use a GNU link.exe (if in PATH before the MSVC
+    // bin dir).
+    linker = opts::isUsingLTO() ? "lld-link.exe"
+                                : msvcEnv.tryResolveToolPath("link.exe");
 #else
     linker = "lld-link";
 #endif

driver/tool.cpp

@@ -286,6 +286,15 @@ int executeToolAndWait(const Loc &loc, const std::string &tool_,
 namespace windows {
 
 namespace {
+
+// cached 'singleton', lazily initialized (as that can be very expensive)
+const VSOptions &getVSOptions() {
+  static VSOptions vsOptions;
+  if (!vsOptions.VSInstallDir)
+    vsOptions.initialize();
+  return vsOptions;
+}
+
 bool setupMsvcEnvironmentImpl(
     bool forPreprocessingOnly,
     std::vector<std::pair<std::wstring, wchar_t *>> *rollback) {
@@ -318,12 +327,9 @@ bool setupMsvcEnvironmentImpl(
   const bool x64 = triple.isArch64Bit();
   const auto begin = std::chrono::steady_clock::now();
 
-  static VSOptions vsOptions; // cache, as this can be expensive
-  if (!vsOptions.VSInstallDir) {
-    vsOptions.initialize();
-    if (!vsOptions.VSInstallDir)
-      return false;
-  }
+  auto &vsOptions = getVSOptions();
+  if (!vsOptions.VSInstallDir)
+    return false;
 
   // cache the environment variable prefixes too
   static llvm::SmallVector<const char *, 2> binPaths;
@@ -446,6 +452,15 @@ MsvcEnvironmentScope::~MsvcEnvironmentScope() {
   }
 }
 
+std::string
+MsvcEnvironmentScope::tryResolveToolPath(const char *fileName) const {
+  const bool x64 = global.params.targetTriple->isArch64Bit();
+  const char *secondaryBindir = nullptr;
+  if (auto bindir = getVSOptions().getVCBinDir(x64, secondaryBindir))
+    return (llvm::Twine(bindir) + "\\" + fileName).str();
+  return fileName;
+}
+
 } // namespace windows
 
 #endif // _WIN32

driver/tool.h

@@ -58,6 +58,10 @@ struct MsvcEnvironmentScope {
 
   ~MsvcEnvironmentScope();
 
+  // Tries to return the absolute path to a VC tool, falling back to the file
+  // name.
+  std::string tryResolveToolPath(const char *fileName) const;
+
 private:
   // for each changed env var: name & original value
   std::vector<std::pair<std::wstring, wchar_t *>> rollback;

ir/irtypeaggr.cpp

@@ -42,7 +42,11 @@ AggrTypeBuilder::AggrTypeBuilder(unsigned offset) : m_offset(offset) {
 void AggrTypeBuilder::addType(llvm::Type *type, unsigned size) {
   const unsigned fieldAlignment = getABITypeAlign(type);
   assert(fieldAlignment);
-  assert((m_offset & (fieldAlignment - 1)) == 0 && "Field is misaligned");
+  // If the field offset does not have natural alignment, mark the aggregate as
+  // packed for IR.
+  if ((m_offset & (fieldAlignment - 1)) != 0) {
+    m_packed = true;
+  }
   m_defaultTypes.push_back(type);
   m_offset += size;
   m_fieldIndex++;

tests/compilable/gh4719.d

@@ -0,0 +1,33 @@
+// RUN: %ldc -c %s
+// RUN: %ldc -c %s -O
+
+struct TraceBuf {
+    align(1) uint args;
+}
+
+// Test correct compilation (no error) of the context pointer type for the delegate of `foo`.
+void foo() {
+    byte[2] fixDescs;
+    TraceBuf fixLog;
+
+    auto dlg = delegate() {
+        fixDescs[0] = 1;
+        fixLog.args = 1;
+    };
+}
+
+class TraceClass {
+    align(1)
+    uint args;
+}
+
+// Test correct compilation (no error) of the context pointer type for the delegate of `foo2`.
+void foo2() {
+    byte[2] fixDescs;
+    scope TraceClass fixLog;
+
+    auto dlg = delegate() {
+        fixDescs[0] = 1;
+        fixLog.args = 1;
+    };
+}

tests/dmd/runnable/ldc_extern_weak.d

@@ -6,7 +6,7 @@
 // REQUIRED_ARGS(osx): -L-undefined -Ldynamic_lookup
 
 // the linker on macOS-arm64 emits a warning
-// TRANSFORM_OUTPUT(osx): remove_lines("warning: -undefined dynamic_lookup may not work with chained fixups")
+// TRANSFORM_OUTPUT(osx): remove_lines("warning:.* -undefined dynamic_lookup")
 
 extern __gshared pragma(LDC_extern_weak) int nonExistent;
 

tools/timetrace2txt.d

@@ -249,16 +249,21 @@ struct Node
         // Output in milliseconds.
         outputTextFile.writef(duration_format_string, cast(double)(this.duration) / 1000);
 
-        if (last_child)
-            indentstring[$-1] = '└';
-        outputTextFile.write(indentstring);
-        outputTextFile.write("- ", this.name);
+        if (indentstring.length > 0) {
+            outputTextFile.write(indentstring[0..$-1]);
+            if (last_child)
+                outputTextFile.write("╰");
+            else
+                outputTextFile.write("├");
+        }
+
+        outputTextFile.write("╼ ", this.name);
         outputTextFile.write(", ", this.detail);
         outputTextFile.writeln(", ", this.location);
         if (last_child)
             indentstring[$-1] = ' ';
 
-        wchar[] child_indentstring = indentstring ~ " |";
+        wchar[] child_indentstring = indentstring ~ "  │";
         foreach (i, ref child; this.children) {
             child.printTree(child_indentstring, i == this.children.length-1);
         }