fixes and update ci

Author: EricCousineau-TRI

.github/workflows/ci.yml

@@ -166,82 +166,82 @@ jobs:
       run: pytest tests/extra_setuptools
 
 
-  # deadsnakes:
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       include:
-  #       - python-version: 3.9
-  #         python-debug: true
-  #         valgrind: true
-  #       - python-version: 3.10-dev
-  #         python-debug: false
+  deadsnakes:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - python-version: 3.9
+          python-debug: true
+          valgrind: true
+        # - python-version: 3.10-dev
+        #   python-debug: false
 
-  #   name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
-  #   runs-on: ubuntu-latest
+    name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
+    runs-on: ubuntu-latest
 
-  #   steps:
-  #   - uses: actions/checkout@v2
+    steps:
+    - uses: actions/checkout@v2
 
-  #   - name: Setup Python ${{ matrix.python-version }} (deadsnakes)
-  #     uses: deadsnakes/[email protected]
-  #     with:
-  #       python-version: ${{ matrix.python-version }}
-  #       debug: ${{ matrix.python-debug }}
+    - name: Setup Python ${{ matrix.python-version }} (deadsnakes)
+      uses: deadsnakes/[email protected]
+      with:
+        python-version: ${{ matrix.python-version }}
+        debug: ${{ matrix.python-debug }}
 
-  #   - name: Update CMake
-  #     uses: jwlawson/[email protected]
+    - name: Update CMake
+      uses: jwlawson/[email protected]
 
-  #   - name: Valgrind cache
-  #     if: matrix.valgrind
-  #     uses: actions/cache@v2
-  #     id: cache-valgrind
-  #     with:
-  #       path: valgrind
-  #       key: 3.16.1 # Valgrind version
+    - name: Valgrind cache
+      if: matrix.valgrind
+      uses: actions/cache@v2
+      id: cache-valgrind
+      with:
+        path: valgrind
+        key: 3.16.1 # Valgrind version
 
-  #   - name: Compile Valgrind
-  #     if: matrix.valgrind && steps.cache-valgrind.outputs.cache-hit != 'true'
-  #     run: |
-  #       VALGRIND_VERSION=3.16.1
-  #       curl https://sourceware.org/pub/valgrind/valgrind-$VALGRIND_VERSION.tar.bz2 -o - | tar xj
-  #       mv valgrind-$VALGRIND_VERSION valgrind
-  #       cd valgrind
-  #       ./configure
-  #       make -j 2 > /dev/null
-
-  #   - name: Install Valgrind
-  #     if: matrix.valgrind
-  #     working-directory: valgrind
-  #     run: |
-  #       sudo make install
-  #       sudo apt-get update
-  #       sudo apt-get install libc6-dbg  # Needed by Valgrind
+    - name: Compile Valgrind
+      if: matrix.valgrind && steps.cache-valgrind.outputs.cache-hit != 'true'
+      run: |
+        VALGRIND_VERSION=3.16.1
+        curl https://sourceware.org/pub/valgrind/valgrind-$VALGRIND_VERSION.tar.bz2 -o - | tar xj
+        mv valgrind-$VALGRIND_VERSION valgrind
+        cd valgrind
+        ./configure
+        make -j 2 > /dev/null
+
+    - name: Install Valgrind
+      if: matrix.valgrind
+      working-directory: valgrind
+      run: |
+        sudo make install
+        sudo apt-get update
+        sudo apt-get install libc6-dbg  # Needed by Valgrind
 
-  #   - name: Prepare env
-  #     run: python -m pip install -r tests/requirements.txt --prefer-binary
+    - name: Prepare env
+      run: python -m pip install -r tests/requirements.txt --prefer-binary
 
-  #   - name: Configure
-  #     run: >
-  #       cmake -S . -B build
-  #       -DCMAKE_BUILD_TYPE=Debug
-  #       -DPYBIND11_WERROR=ON
-  #       -DDOWNLOAD_CATCH=ON
-  #       -DDOWNLOAD_EIGEN=ON
-  #       -DCMAKE_CXX_STANDARD=17
+    - name: Configure
+      run: >
+        cmake -S . -B build
+        -DCMAKE_BUILD_TYPE=Debug
+        -DPYBIND11_WERROR=ON
+        -DDOWNLOAD_CATCH=ON
+        -DDOWNLOAD_EIGEN=ON
+        -DCMAKE_CXX_STANDARD=17
 
-  #   - name: Build
-  #     run: cmake --build build -j 2
+    - name: Build
+      run: cmake --build build -j 2
 
-  #   - name: Python tests
-  #     run: cmake --build build --target pytest
+    - name: Python tests
+      run: cmake --build build --target pytest
 
-  #   - name: C++ tests
-  #     run: cmake --build build --target cpptest
+    - name: C++ tests
+      run: cmake --build build --target cpptest
 
-  #   - name: Run Valgrind on Python tests
-  #     if: matrix.valgrind
-  #     run: cmake --build build --target memcheck
+    - name: Run Valgrind on Python tests
+      if: matrix.valgrind
+      run: cmake --build build --target memcheck
 
 
   # Testing on clang using the excellent silkeh clang docker images

include/pybind11/pybind11.h

@@ -1489,7 +1489,12 @@ class class_ : public detail::generic_type {
         // This should be called when the item is *actually* being deleted
         // TODO(eric.cousineau): Do we care about use cases where the user manually calls this?
         auto *inst = (detail::instance *) self.ptr();
-        const detail::type_info *lowest_type = detail::get_lowest_type(self);
+        const detail::type_info *lowest_type = detail::get_lowest_type(self, false);
+        if (!lowest_type) {
+            // This should only happen in a multi-inheritance case (which is
+            // not yet supported for this fork's ownership transfer setup).
+            return;
+        }
         auto& release_info = lowest_type->release_info;
         // The references are as follows:
         //   1. When Python calls __del__ via tp_del (default slot)