libreoffice/pyuno/source/module/pyuno_callable.cxx
Michael Weghorn 07de0b7c91 pyuno: Initialize tp_versions_used for Python >= 3.13
This was added in cpython commit [1]

    commit 992446dd5bd3fff92ea0f8064fb19eebfe105cef
    Author: Mark Shannon <mark@hotpy.org>
    Date:   Mon Feb 5 16:20:54 2024 +0000

        GH-113462: Limit the number of versions that a single class can use. (GH-114900)

, causing an `--enable-werror` build on Debian testing using
system python3-dev 3.13.2-2 to fail like this:

    /home/michi/development/git/libreoffice/pyuno/source/module/pyuno_iterator.cxx:185:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
      185 | };
          | ^
    /home/michi/development/git/libreoffice/pyuno/source/module/pyuno_iterator.cxx:334:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
      334 | };
          | ^
    2 errors generated.
    make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_iterator.o] Error 1
    make[1]: *** Waiting for unfinished jobs....
    /home/michi/development/git/libreoffice/pyuno/source/module/pyuno_callable.cxx:252:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
      252 | };
          | ^
    1 error generated.
    make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_callable.o] Error 1
    /home/michi/development/git/libreoffice/pyuno/source/module/pyuno_struct.cxx:377:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
      377 | };
          | ^
    1 error generated.
    make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_struct.o] Error 1
    /home/michi/development/git/libreoffice/pyuno/source/module/pyuno.cxx:1693:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
     1693 | };
          | ^
    1 error generated.
    make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno.o] Error 1
    /home/michi/development/git/libreoffice/pyuno/source/module/pyuno_runtime.cxx:147:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
      147 | };
          | ^
    1 error generated.
    make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_runtime.o] Error 1
    make: *** [Makefile:128: pyuno] Error 2

Initialize the member to 0, as e.g. commit [2] does for swig.

For cpython versions this is contained in (from within cpython git repo):

    $ git tag --contains 992446dd5bd3fff92ea0f8064fb19eebfe105cef
    v3.13.0
    v3.13.0a4
    v3.13.0a5
    v3.13.0a6
    v3.13.0b1
    v3.13.0b2
    v3.13.0b3
    v3.13.0b4
    v3.13.0rc1
    v3.13.0rc2
    v3.13.0rc3
    v3.13.1
    v3.13.2
    v3.13.3
    v3.14.0a1
    v3.14.0a2
    v3.14.0a3
    v3.14.0a4
    v3.14.0a5
    v3.14.0a6
    v3.14.0a7

[1] 992446dd5b
[2] c3e30c5734

Change-Id: I1ad4c511880cf00e4c45b9e835edcd245fe2853c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184198
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2025-04-15 13:15:42 +02:00

281 lines
7.5 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "pyuno_impl.hxx"
#include <osl/diagnose.h>
#include <com/sun/star/script/CannotConvertException.hpp>
#include <com/sun/star/script/XInvocation2.hpp>
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
using com::sun::star::uno::RuntimeException;
using com::sun::star::script::XInvocation2;
namespace pyuno
{
namespace {
struct PyUNO_callable_Internals
{
Reference<XInvocation2> xInvocation;
OUString methodName;
ConversionMode mode;
};
struct PyUNO_callable
{
PyObject_HEAD
PyUNO_callable_Internals* members;
};
}
static void PyUNO_callable_del (PyObject* self)
{
PyUNO_callable* me;
me = reinterpret_cast<PyUNO_callable*>(self);
delete me->members;
PyObject_Del (self);
}
static PyObject* PyUNO_callable_call(
PyObject* self, PyObject* args, SAL_UNUSED_PARAMETER PyObject*)
{
PyUNO_callable* me;
Sequence<short> aOutParamIndex;
Sequence<Any> aOutParam;
Sequence<Any> aParams;
Any any_params;
Any ret_value;
RuntimeCargo *cargo = nullptr;
me = reinterpret_cast<PyUNO_callable*>(self);
PyRef ret;
try
{
Runtime runtime;
cargo = runtime.getImpl()->cargo;
any_params = runtime.pyObject2Any (args, me->members->mode);
if (any_params.getValueTypeClass () == css::uno::TypeClass_SEQUENCE)
{
any_params >>= aParams;
}
else
{
aParams = { any_params };
}
{
PyThreadDetach antiguard; //python free zone
// do some logging if desired ...
if( isLog( cargo, LogLevel::CALL ) )
{
logCall( cargo, "try py->uno[0x", me->members->xInvocation.get(),
me->members->methodName, aParams );
}
// do the call
ret_value = me->members->xInvocation->invoke (
me->members->methodName, aParams, aOutParamIndex, aOutParam);
// log the reply, if desired
if( isLog( cargo, LogLevel::CALL ) )
{
logReply( cargo, "success py->uno[0x", me->members->xInvocation.get(),
me->members->methodName, ret_value, aOutParam);
}
}
PyRef temp = runtime.any2PyObject (ret_value);
if( aOutParam.getLength() )
{
PyRef return_list( PyTuple_New (1+aOutParam.getLength()), SAL_NO_ACQUIRE, NOT_NULL );
PyTuple_SetItem (return_list.get(), 0, temp.getAcquired());
// initialize with defaults in case of exceptions
int i;
for( i = 1 ; i < 1+aOutParam.getLength() ; i ++ )
{
Py_INCREF( Py_None );
PyTuple_SetItem( return_list.get() , i , Py_None );
}
for( i = 0 ; i < aOutParam.getLength() ; i ++ )
{
PyRef ref = runtime.any2PyObject( aOutParam[i] );
PyTuple_SetItem (return_list.get(), 1+i, ref.getAcquired());
}
ret = std::move(return_list);
}
else
{
ret = std::move(temp);
}
}
catch( const css::reflection::InvocationTargetException & e )
{
if( isLog( cargo, LogLevel::CALL ) )
{
logException( cargo, "except py->uno[0x", me->members->xInvocation.get() ,
me->members->methodName, e.TargetException.getValue(), e.TargetException.getValueTypeRef());
}
raisePyExceptionWithAny( e.TargetException );
}
catch( const css::script::CannotConvertException &e )
{
if( isLog( cargo, LogLevel::CALL ) )
{
logException( cargo, "error py->uno[0x", me->members->xInvocation.get() ,
me->members->methodName, &e, cppu::UnoType<decltype(e)>::get().getTypeLibType());
}
raisePyExceptionWithAny( css::uno::Any( e ) );
}
catch( const css::lang::IllegalArgumentException &e )
{
if( isLog( cargo, LogLevel::CALL ) )
{
logException( cargo, "error py->uno[0x", me->members->xInvocation.get() ,
me->members->methodName, &e, cppu::UnoType<decltype(e)>::get().getTypeLibType());
}
raisePyExceptionWithAny( css::uno::Any( e ) );
}
catch (const css::uno::RuntimeException &e)
{
if( cargo && isLog( cargo, LogLevel::CALL ) )
{
logException( cargo, "error py->uno[0x", me->members->xInvocation.get() ,
me->members->methodName, &e, cppu::UnoType<decltype(e)>::get().getTypeLibType());
}
raisePyExceptionWithAny( css::uno::Any( e ) );
}
return ret.getAcquired();
}
static PyTypeObject PyUNO_callable_Type =
{
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
"PyUNO_callable",
sizeof (PyUNO_callable),
0,
::pyuno::PyUNO_callable_del,
#if PY_VERSION_HEX >= 0x03080000
0, // Py_ssize_t tp_vectorcall_offset
#else
nullptr, // printfunc tp_print
#endif
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
::pyuno::PyUNO_callable_call,
nullptr,
nullptr,
nullptr,
nullptr,
0,
nullptr,
nullptr,
nullptr,
nullptr,
0,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
0,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr
, 0
#if PY_VERSION_HEX >= 0x03040000
, nullptr
#if PY_VERSION_HEX >= 0x03080000
, nullptr // vectorcallfunc tp_vectorcall
#if PY_VERSION_HEX < 0x03090000
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
, nullptr // tp_print
#if defined __clang__
#pragma clang diagnostic pop
#endif
#endif
#if PY_VERSION_HEX >= 0x030C00A1
, 0 // tp_watched
#endif
#if PY_VERSION_HEX >= 0x030D00A4
, 0 // tp_versions_used
#endif
#endif
#endif
};
PyRef PyUNO_callable_new (
const Reference<XInvocation2> &my_inv,
const OUString & methodName,
enum ConversionMode mode )
{
PyUNO_callable* self;
OSL_ENSURE (my_inv.is(), "XInvocation must be valid");
self = PyObject_New (PyUNO_callable, &PyUNO_callable_Type);
if (self == nullptr)
return nullptr; //NULL == Error!
self->members = new PyUNO_callable_Internals;
self->members->xInvocation = my_inv;
self->members->methodName = methodName;
self->members->mode = mode;
return PyRef( reinterpret_cast<PyObject*>(self), SAL_NO_ACQUIRE );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */