Merge branch 'codon-17' into release/17.x

.github/actions/build-manylinux/Dockerfile

@@ -0,0 +1,3 @@
+FROM quay.io/pypa/manylinux2014_x86_64
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

.github/actions/build-manylinux/action.yml

@@ -0,0 +1,5 @@
+name: manylinux build
+description: Builds LLVM on manylinux
+runs:
+  using: docker
+  image: Dockerfile

.github/actions/build-manylinux/entrypoint.sh

@@ -0,0 +1,29 @@
+#!/bin/sh -l
+set -e
+
+# setup
+cd /github/workspace
+yum -y update
+yum -y install ninja-build
+
+# compile LLVM
+cmake -S llvm -B build-llvm -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_INCLUDE_TESTS=OFF \
+    -DLLVM_ENABLE_RTTI=ON \
+    -DLLVM_ENABLE_ZLIB=OFF \
+    -DLLVM_ENABLE_TERMINFO=OFF \
+    -DLLVM_TARGETS_TO_BUILD=all \
+    -DLLVM_ENABLE_LIBEDIT=OFF
+cmake --build build-llvm
+cmake --install build-llvm --prefix=/opt/llvm-codon
+
+cmake -S clang -B build-clang -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_ENABLE_LIBEDIT=OFF
+cmake --build build-clang
+cmake --install build-clang --prefix=/opt/llvm-codon
+
+export LLVM_BUILD_ARCHIVE=llvm-$(uname -s | awk '{print tolower($0)}')-$(uname -m).tar.gz
+tar -czf ${LLVM_BUILD_ARCHIVE} /opt/llvm-codon
+echo "Done"

.github/workflows/ci.yml

@@ -0,0 +1,186 @@
+name: LLVM-Codon CI
+
+on:
+  push:
+    branches:
+      - codon
+      - 'codon-*'
+    tags:
+      - '*'
+
+jobs:
+  release:
+    name: Create GitHub Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check
+        if: contains(github.ref, 'tags/codon-')
+        id: check
+        run: echo "::set-output name=MAKE_RELEASE::true"
+
+      - name: Create Release
+        id: create_release
+        if: steps.check.outputs.MAKE_RELEASE
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: false
+
+      - name: Output Release URL File
+        if: steps.check.outputs.MAKE_RELEASE
+        run: echo "${{ steps.create_release.outputs.upload_url }}" > release_url.txt
+
+      - name: Save Release URL File for Publish
+        if: steps.check.outputs.MAKE_RELEASE
+        uses: actions/upload-artifact@v1
+        with:
+          name: release_url
+          path: release_url.txt
+
+  manylinux:
+    runs-on: ubuntu-latest
+    name: LLVM-Codon CI (manylinux)
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache Dependencies
+        id: cache-deps
+        uses: actions/cache@v2
+        with:
+          path: llvm
+          key: manylinux-llvm
+
+      - name: Main
+        uses: ./.github/actions/build-manylinux
+
+      - name: Load Release URL File
+        if: contains(github.ref, 'tags/codon-')
+        uses: actions/download-artifact@v1
+        with:
+          name: release_url
+
+      - name: Get Release URL
+        id: get_release_url
+        if: contains(github.ref, 'tags/codon-')
+        run: |
+          echo ::set-output name=file_name::${REPOSITORY_NAME##*/}-${TAG_REF_NAME##*/v} # RepositoryName-v1.0.0
+          value=`cat release_url/release_url.txt`
+          echo ::set-output name=upload_url::$value
+        env:
+          TAG_REF_NAME: ${{ github.ref }}
+          REPOSITORY_NAME: ${{ github.repository }}
+
+      - name: Upload Release Asset
+        if: contains(github.ref, 'tags/codon-')
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.get_release_url.outputs.upload_url }}
+          asset_path: ./llvm-linux-x86_64.tar.gz
+          asset_name: llvm-linux-x86_64.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: manylinux-x86_64
+          path: llvm-linux-x86_64.tar.gz
+
+  main:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-11
+    runs-on: ${{ matrix.os }}
+    name: LLVM-Codon CI
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          brew install ninja
+          sudo mkdir -p /usr/local/llvm-codon
+          sudo chown -R `whoami` /usr/local/llvm-codon
+          echo "OPT=/usr/local" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo apt-get install -y ninja-build
+          echo "OPT=/opt" >> $GITHUB_ENV
+
+      - name: Build LLVM
+        run: |
+          cmake -S llvm -B build-llvm -G Ninja \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DLLVM_INCLUDE_TESTS=OFF \
+              -DLLVM_ENABLE_RTTI=ON \
+              -DLLVM_ENABLE_ZLIB=OFF \
+              -DLLVM_ENABLE_TERMINFO=OFF \
+              -DLLVM_TARGETS_TO_BUILD=all \
+              -DLLVM_ENABLE_LIBEDIT=OFF
+          cmake --build build-llvm
+          cmake --install build-llvm --prefix=${OPT}/llvm-codon
+
+      - name: Build Clang
+        run: |
+          cmake -S clang -B build-clang -G Ninja \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DLLVM_ENABLE_LIBEDIT=OFF
+          cmake --build build-clang
+          cmake --install build-clang --prefix=${OPT}/llvm-codon
+
+      - name: Prepare Artifacts
+        run: |
+          tar -czf llvm-$(uname -s | awk '{print tolower($0)}')-$(uname -m).tar.gz ${OPT}/llvm-codon
+
+      - name: Load Release URL File
+        if: contains(github.ref, 'tags/codon-')
+        uses: actions/download-artifact@v1
+        with:
+          name: release_url
+
+      - name: Get Release URL
+        id: get_release_url
+        if: contains(github.ref, 'tags/codon-')
+        run: |
+          echo ::set-output name=file_name::${REPOSITORY_NAME##*/}-${TAG_REF_NAME##*/v} # RepositoryName-v1.0.0
+          value=`cat release_url/release_url.txt`
+          echo ::set-output name=upload_url::$value
+        env:
+          TAG_REF_NAME: ${{ github.ref }}
+          REPOSITORY_NAME: ${{ github.repository }}
+
+      - name: Upload Release Asset
+        if: contains(github.ref, 'tags/codon-') && startsWith(matrix.os, 'macos')
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.get_release_url.outputs.upload_url }}
+          asset_path: ./llvm-darwin-x86_64.tar.gz
+          asset_name: llvm-darwin-x86_64.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload Artifacts
+        if: startsWith(matrix.os, 'macos')
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }}-x86_64
+          path: llvm-darwin-x86_64.tar.gz
+
+      - name: Upload Artifacts
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }}-x86_64
+          path: llvm-linux-x86_64.tar.gz

llvm/lib/Transforms/Coroutines/CoroElide.cpp

@@ -11,6 +11,7 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/Analysis/CaptureTracking.h"
 #include "llvm/Analysis/InstructionSimplify.h"
 #include "llvm/Analysis/OptimizationRemarkEmitter.h"
 #include "llvm/IR/Dominators.h"
@@ -52,6 +53,29 @@ struct Lowerer : coro::LowererBase {
   bool hasEscapePath(const CoroBeginInst *,
                      const SmallPtrSetImpl<BasicBlock *> &) const;
 };
+
+struct CoroCaptureTracker : public CaptureTracker {
+  CoroCaptureTracker() : Captured(false) {}
+
+  bool captured(const Use *U) override {
+    Captured = true;
+    return true;
+  }
+
+  bool shouldExplore(const Use *U) override {
+    Instruction *I = cast<Instruction>(U->getUser());
+    if (auto *C = dyn_cast<CallBase>(I)) {
+      const bool Explore = isa<Function>(C->getCalledOperand()) &&
+                           !C->doesNotCapture(C->getArgOperandNo(U));
+      return Explore;
+    }
+    return true;
+  }
+
+  void tooManyUses() override { Captured = true; }
+
+  bool Captured;
+};
 } // end anonymous namespace
 
 // Go through the list of coro.subfn.addr intrinsics and replace them with the
@@ -266,51 +290,15 @@ bool Lowerer::shouldElide(Function *F, DominatorTree &DT) const {
   if (CoroAllocs.empty())
     return false;
 
-  // Check that for every coro.begin there is at least one coro.destroy directly
-  // referencing the SSA value of that coro.begin along each
-  // non-exceptional path.
-  // If the value escaped, then coro.destroy would have been referencing a
-  // memory location storing that value and not the virtual register.
-
-  SmallPtrSet<BasicBlock *, 8> Terminators;
-  // First gather all of the terminators for the function.
-  // Consider the final coro.suspend as the real terminator when the current
-  // function is a coroutine.
-  for (BasicBlock &B : *F) {
-    auto *TI = B.getTerminator();
-
-    if (TI->getNumSuccessors() != 0 || isa<UnreachableInst>(TI))
-      continue;
-
-    Terminators.insert(&B);
-  }
-
-  // Filter out the coro.destroy that lie along exceptional paths.
-  SmallPtrSet<CoroBeginInst *, 8> ReferencedCoroBegins;
-  for (const auto &It : DestroyAddr) {
-    // If every terminators is dominated by coro.destroy, we could know the
-    // corresponding coro.begin wouldn't escape.
-    //
-    // Otherwise hasEscapePath would decide whether there is any paths from
-    // coro.begin to Terminators which not pass through any of the
-    // coro.destroys.
-    //
-    // hasEscapePath is relatively slow, so we avoid to run it as much as
-    // possible.
-    if (llvm::all_of(Terminators,
-                     [&](auto *TI) {
-                       return llvm::any_of(It.second, [&](auto *DA) {
-                         return DT.dominates(DA, TI->getTerminator());
-                       });
-                     }) ||
-        !hasEscapePath(It.first, Terminators))
-      ReferencedCoroBegins.insert(It.first);
+  // Ensure no coroutine handle escapes the parent function.
+  for (CoroBeginInst *CB : CoroBegins) {
+    CoroCaptureTracker CCT;
+    PointerMayBeCaptured(CB, &CCT, /*MaxUsesToExplore=*/32);
+    if (CCT.Captured)
+      return false;
   }
 
-  // If size of the set is the same as total number of coro.begin, that means we
-  // found a coro.free or coro.destroy referencing each coro.begin, so we can
-  // perform heap elision.
-  return ReferencedCoroBegins.size() == CoroBegins.size();
+  return true;
 }
 
 void Lowerer::collectPostSplitCoroIds(Function *F) {

llvm/lib/Transforms/Coroutines/CoroSplit.cpp

@@ -968,7 +968,7 @@ void CoroCloner::create() {
         Context, AttrBuilder(Context, OrigAttrs.getFnAttrs()));
 
     addFramePointerAttrs(NewAttrs, Context, 0, Shape.FrameSize,
-                         Shape.FrameAlign, /*NoAlias=*/false);
+                         Shape.FrameAlign, /*NoAlias=*/true);
     break;
   case coro::ABI::Async: {
     auto *ActiveAsyncSuspend = cast<CoroSuspendAsyncInst>(ActiveSuspend);