Merge rust-lang#37

37: Upgrade to LLVM main and add back our changes. r=ltratt a=ptersilie



Co-authored-by: Edd Barrett <[email protected]>
Co-authored-by: Lukas Diekmann <[email protected]>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>

Author: 3 people

.buildbot.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+
+INST_DIR=`pwd`/inst
+
+mkdir -p build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=${INST_DIR} \
+    -DLLVM_INSTALL_UTILS=On \
+    -DCMAKE_BUILD_TYPE=release \
+    -DLLVM_ENABLE_ASSERTIONS=On \
+    -DLLVM_ENABLE_PROJECTS="lld;clang" \
+    ../llvm
+make -j `nproc` install
+
+# clang-format any new files that we've introduced ourselves.
+cd ..
+PATH=${INST_DIR}/bin:${PATH}
+git fetch origin main:refs/remotes/origin/main
+sh yk_format_new_files.sh
+git diff --exit-code
+
+# There are many test suites for LLVM:
+# https://llvm.org/docs/TestingGuide.html
+#
+# This runs unit and integration tests.
+cd build
+make -j `nproc` check-all
+cd ..
+
+# FIXME The commented code below should run the `test-suite` tests, as
+# described at https://llvm.org/docs/TestSuiteGuide.html.
+#
+# However, the suite fails (even on a stock LLVM) with this error:
+#   retref-bench.cc:17:10: fatal error: 'xray/xray_interface.h' file not found
+#   #include "xray/xray_interface.h"
+#            ^~~~~~~~~~~~~~~~~~~~~~~
+#
+#git clone --depth 1 --branch llvmorg-12.0.0 https://github.com/llvm/llvm-test-suite.git test-suite
+#mkdir -p test-suite-build
+#cd test-suite-build
+#cmake -DCMAKE_C_COMPILER=${INST_DIR}/bin/clang \
+#	-C../test-suite/cmake/caches/O3.cmake \
+#	../test-suite
+#make -j `nproc`
+#llvm-lit -v -j 1 -o results.json .

.buildbot_dockerfile_debian

@@ -0,0 +1,9 @@
+FROM debian:bullseye
+ARG CI_UID
+RUN useradd -m -u ${CI_UID} ci
+RUN apt-get update && \
+    apt-get -y install build-essential curl cmake python3-distutils git
+WORKDIR /ci
+RUN chown ${CI_UID}:${CI_UID} .
+COPY --chown=${CI_UID}:${CI_UID} . .
+CMD sh -x .buildbot.sh

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*.{cpp,cc,c,h}]
+indent_style = space
+indent_size = 2