[cppyy] Consider Python int and float for make_unique optimization

bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py

@@ -40,7 +40,7 @@
     'include',                # load and jit a header file
     'c_include',              # load and jit a C header file
     'load_library',           # load a shared library
     'nullptr',                # unique pointer representing NULL
     'sizeof',                 # size of a C++ type
     'typeid',                 # typeid of a C++ type
     'multi',                  # helper for multiple inheritance
@@ -64,27 +64,27 @@
     ispypy = False
 
 from . import _typemap
 from ._version import __version__
 
 # import separately instead of in the above try/except block for easier to
 # understand tracebacks
 if ispypy:
     from ._pypy_cppyy import *
 else:
     from ._cpython_cppyy import *
 
 
 #- allow importing from gbl --------------------------------------------------
 sys.modules['cppyy.gbl'] = gbl
 sys.modules['cppyy.gbl.std'] = gbl.std
 
 
 #- external typemap ----------------------------------------------------------
 _typemap.initialize(_backend)               # also creates (u)int8_t mapper
 
 try:
     gbl.std.int8_t  = gbl.int8_t            # ensures same _integer_ type
     gbl.std.uint8_t = gbl.uint8_t
 except (AttributeError, TypeError):
     pass
 
@@ -153,12 +153,19 @@
     def __call__(self, ptr):
         return py_make_smartptr(type(ptr), self.ptrcls)(ptr)
     def __getitem__(self, cls):
+        # For the builtin types that directly map to C++ types, we get the name
+        # immediately so we don't reach the fallback in the end.
+        # See also Utility::ConstructTemplateArgs() in CPyCpyy.
+        if cls is int:
+            cls = "int"
+        elif cls is float:
+            cls = "float"
         try:
             if not cls.__module__ == int.__module__:
                 return py_make_smartptr(cls, self.ptrcls)
         except AttributeError:
             pass
-        if isinstance(cls, str) and not cls in ('int', 'float'):
+        if isinstance(cls, str):
             return py_make_smartptr(getattr(gbl, cls), self.ptrcls)
         return self.maker[cls]
 

bindings/pyroot/cppyy/cppyy/test/test_cpp11features.py

@@ -438,7 +438,6 @@ def test14_shared_ptr_passing(self):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    @mark.xfail(strict=True, condition=IS_WINDOWS | IS_MAC_ARM, reason='ValueError: Could not find "make_unique<int>"')
     def test15_unique_ptr_template_deduction(self):
         """Argument type deduction with std::unique_ptr"""
 
@@ -458,7 +457,6 @@ def test15_unique_ptr_template_deduction(self):
         with raises(ValueError):  # not an RValue
             cppyy.gbl.UniqueTempl.returnptr[int](uptr_in)
 
-    @mark.xfail(strict=True, condition=IS_WINDOWS | IS_MAC_ARM, reason='TypeError: Could not find "make_unique<int>"')
     def test16_unique_ptr_moves(self):
         """std::unique_ptr requires moves"""