Nuitka-winsvc 1.6.6__cp310-cp310-win_amd64.whl → 1.7.5__cp310-cp310-win_amd64.whl

nuitka/build/static_src/MainProgram.c

@@ -48,6 +48,18 @@
 #define NUITKA_MAIN_MODULE_NAME "__main__"
 #endif
 
+// It doesn't work for MinGW64 to update the standard output handles early on,
+// so make a difference here.
+#if defined(NUITKA_FORCED_STDOUT_PATH) || defined(NUITKA_FORCED_STDERR_PATH)
+#if defined(__MINGW64__) || defined(__MINGW32__)
+#define NUITKA_STANDARD_HANDLES_EARLY 0
+#else
+#define NUITKA_STANDARD_HANDLES_EARLY 1
+#endif
+#else
+#define NUITKA_STANDARD_HANDLES_EARLY 0
+#endif
+
 extern PyCodeObject *codeobj_main;
 
 /* For later use in "Py_GetArgcArgv" we expose the needed value  */
@@ -388,25 +400,21 @@ static PyObject *EXECUTE_MAIN_MODULE(char const *module_name) {
 }
 
 #ifdef _NUITKA_PLUGIN_WINDOWS_SERVICE_ENABLED
-extern void SvcInstall();
-extern void SvcLaunchService();
+#include "nuitka_windows_service.h"
 
 // Callback from Windows Service logic.
-DWORD WINAPI SvcStartPython(LPVOID lpParam) {
-    if (lpParam == NULL) {
-        EXECUTE_MAIN_MODULE(NUITKA_MAIN_MODULE_NAME);
+bool SvcStartPython(void) {
+    EXECUTE_MAIN_MODULE(NUITKA_MAIN_MODULE_NAME);
 
-        // TODO: Log exception and call ReportSvcStatus
-        if (ERROR_OCCURRED()) {
-            return 1;
-        } else {
-            return 0;
-        }
+    if (ERROR_OCCURRED()) {
+        return true;
     } else {
-        PyErr_SetInterrupt();
-        return 0;
+        return false;
     }
 }
+
+void SvcStopPython(void) { PyErr_SetInterrupt(); }
+
 #endif
 
 // This is a multiprocessing fork
@@ -718,34 +726,6 @@ static char **getCommandLineToArgvA(char *lpCmdline) {
 int _dowildcard = 0;
 #endif
 
-#if defined(NUITKA_FORCED_STDOUT_PATH) || defined(NUITKA_FORCED_STDERR_PATH)
-#ifdef _WIN32
-static PyObject *getExpandedTemplatePath(wchar_t const *template_path) {
-    wchar_t filename_buffer[1024];
-    bool res = expandTemplatePathW(filename_buffer, template_path, sizeof(filename_buffer) / sizeof(wchar_t));
-
-    if (res == false) {
-        puts("Error, couldn't expand pattern:");
-        abort();
-    }
-
-    return NuitkaUnicode_FromWideChar(filename_buffer, -1);
-}
-#else
-static PyObject *getExpandedTemplatePath(char const *template) {
-    char filename_buffer[1024];
-    bool res = expandTemplatePath(filename_buffer, template, sizeof(filename_buffer));
-
-    if (res == false) {
-        printf("Error, couldn't expand pattern: %s\n", template);
-        abort();
-    }
-
-    return Nuitka_String_FromString(filename_buffer);
-}
-#endif
-#endif
-
 #ifdef _WIN32
 static void setStdFileHandleNumber(DWORD std_handle_id, PyObject *file_handle) {
     PyObject *file_no_value = CALL_METHOD_NO_ARGS(file_handle, const_str_plain_fileno);
@@ -822,6 +802,36 @@ static void setStderrHandle(PyObject *stderr_file) {
 #endif
 }
 
+#if NUITKA_STANDARD_HANDLES_EARLY == 0
+#if defined(NUITKA_FORCED_STDOUT_PATH) || defined(NUITKA_FORCED_STDERR_PATH)
+#ifdef _WIN32
+static PyObject *getExpandedTemplatePath(wchar_t const *template_path) {
+    wchar_t filename_buffer[1024];
+    bool res = expandTemplatePathW(filename_buffer, template_path, sizeof(filename_buffer) / sizeof(wchar_t));
+
+    if (res == false) {
+        puts("Error, couldn't expand pattern:");
+        abort();
+    }
+
+    return NuitkaUnicode_FromWideChar(filename_buffer, -1);
+}
+#else
+static PyObject *getExpandedTemplatePath(char const *template) {
+    char filename_buffer[1024];
+    bool res = expandTemplatePath(filename_buffer, template, sizeof(filename_buffer));
+
+    if (res == false) {
+        printf("Error, couldn't expand pattern: %s\n", template);
+        abort();
+    }
+
+    return Nuitka_String_FromString(filename_buffer);
+}
+#endif
+#endif
+#endif
+
 static void setInputOutputHandles(void) {
     // We support disabling the stdout/stderr through options as well as
     // building for GUI on Windows, which has inputs disabled by default, this
@@ -832,36 +842,45 @@ static void setInputOutputHandles(void) {
     // platform ones in the future.
     PyObject *encoding = NULL;
 
-    {
-#if defined(_WIN32)
-        PyObject *devnull_filename = Nuitka_String_FromString("NUL:");
-#else
-        PyObject *devnull_filename = Nuitka_String_FromString("/dev/null");
-#endif
+// Reconfigure stdout for line buffering, for mixing traces and Python IO
+// better, and force it to utf-8, it often becomes platform IO for no good
+// reason.
+#if NUITKA_STANDARD_HANDLES_EARLY == 1 && PYTHON_VERSION >= 0x370
+#if defined(NUITKA_FORCED_STDOUT_PATH) || defined(NUITKA_FORCED_STDERR_PATH)
+    PyObject *args = MAKE_DICT_EMPTY();
 
-        if (shallSetOutputHandleToNull("stdin")) {
-            // CPython core requires stdin to be buffered due to methods usage, and it won't matter
-            // here much.
-            PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(devnull_filename, "r", true, encoding);
+    DICT_SET_ITEM(args, const_str_plain_encoding, Nuitka_String_FromString("utf-8"));
+    DICT_SET_ITEM(args, const_str_plain_line_buffering, Py_True);
 
-            setStdinHandle(stdin_file);
-        }
+#if defined(NUITKA_FORCED_STDOUT_PATH)
+    {
+        PyObject *sys_stdout = Nuitka_SysGetObject("stdout");
 
-        if (shallSetOutputHandleToNull("stdout")) {
-            PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(devnull_filename, "w", false, encoding);
+        PyObject *method = LOOKUP_ATTRIBUTE(sys_stdout, const_str_plain_reconfigure);
+        CHECK_OBJECT(method);
 
-            setStdoutHandle(stdout_file);
-        }
+        PyObject *result = CALL_FUNCTION_WITH_KEYARGS(method, args);
+        CHECK_OBJECT(result);
+    }
+#endif
 
-        if (shallSetOutputHandleToNull("stderr")) {
-            PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(devnull_filename, "w", false, encoding);
+#if defined(NUITKA_FORCED_STDERR_PATH)
+    {
+        PyObject *sys_stderr = Nuitka_SysGetObject("stderr");
 
-            setStderrHandle(stderr_file);
-        }
+        PyObject *method = LOOKUP_ATTRIBUTE(sys_stderr, const_str_plain_reconfigure);
+        CHECK_OBJECT(method);
 
-        Py_DECREF(devnull_filename);
+        PyObject *result = CALL_FUNCTION_WITH_KEYARGS(method, args);
+        CHECK_OBJECT(result);
     }
+#endif
+
+    Py_DECREF(args);
+#endif
+#endif
 
+#if NUITKA_STANDARD_HANDLES_EARLY == 0
 #if defined(NUITKA_FORCED_STDOUT_PATH)
     {
 #ifdef _WIN32
@@ -879,14 +898,6 @@ static void setInputOutputHandles(void) {
     }
 #endif
 
-#if NUITKA_FORCED_STDOUT_NONE_BOOL
-    setStdoutHandle(Py_None);
-#endif
-
-#if NUITKA_FORCED_STDERR_NONE_BOOL
-    setStderrHandle(Py_None);
-#endif
-
 #if defined(NUITKA_FORCED_STDERR_PATH)
     {
 #ifdef _WIN32
@@ -903,6 +914,45 @@ static void setInputOutputHandles(void) {
         setStderrHandle(stderr_file);
     }
 #endif
+#endif
+
+    {
+#if defined(_WIN32)
+        PyObject *devnull_filename = Nuitka_String_FromString("NUL:");
+#else
+        PyObject *devnull_filename = Nuitka_String_FromString("/dev/null");
+#endif
+
+        if (shallSetOutputHandleToNull("stdin")) {
+            // CPython core requires stdin to be buffered due to methods usage, and it won't matter
+            // here much.
+            PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(devnull_filename, "r", true, encoding);
+
+            setStdinHandle(stdin_file);
+        }
+
+        if (shallSetOutputHandleToNull("stdout")) {
+            PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(devnull_filename, "w", false, encoding);
+
+            setStdoutHandle(stdout_file);
+        }
+
+        if (shallSetOutputHandleToNull("stderr")) {
+            PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(devnull_filename, "w", false, encoding);
+
+            setStderrHandle(stderr_file);
+        }
+
+        Py_DECREF(devnull_filename);
+    }
+
+#if NUITKA_FORCED_STDOUT_NONE_BOOL
+    setStdoutHandle(Py_None);
+#endif
+
+#if NUITKA_FORCED_STDERR_NONE_BOOL
+    setStderrHandle(Py_None);
+#endif
 
     Py_XDECREF(encoding);
 }
@@ -957,11 +1007,131 @@ static void Nuitka_Py_Initialize(void) {
 
 #ifdef _NUITKA_STANDALONE
     assert(wcscmp(config.exec_prefix, binary_directory) == 0);
+
+// Empty "sys.path" first time, will be revived, but keep it
+// short lived.
+#if SYSFLAG_ISOLATED
+    Nuitka_SysSetObject("path", PyList_New(0));
+#endif
 #endif
 
 #endif
 }
 
+#include <fcntl.h>
+
+#if NUITKA_STANDARD_HANDLES_EARLY == 1
+#if defined(_WIN32)
+
+static void changeStandardHandleTarget(int std_handle_id, FILE *std_handle, filename_char_t const *template) {
+    filename_char_t filename_buffer[1024];
+
+    // TODO: We should only have one that works with filename_char_t rather than having
+    // to make a difference here.
+#ifdef _WIN32
+    bool res = expandTemplatePathW(filename_buffer, template, sizeof(filename_buffer) / sizeof(filename_char_t));
+
+    if (res == false) {
+        wprintf(L"Error, couldn't expand pattern '%lS'\n", template);
+        abort();
+    }
+#else
+    bool res = expandTemplatePath(filename_buffer, template, sizeof(filename_buffer) / sizeof(filename_char_t));
+
+    if (res == false) {
+        printf("Error, couldn't expand pattern: '%s'\n", template);
+        abort();
+    }
+#endif
+
+    if (GetStdHandle(std_handle_id) == 0) {
+        FILE *file_handle;
+
+        if (std_handle_id == STD_INPUT_HANDLE) {
+            file_handle = _wfreopen(filename_buffer, L"rb", std_handle);
+        } else {
+            file_handle = _wfreopen(filename_buffer, L"wb", std_handle);
+        }
+
+        if (file_handle == NULL) {
+            perror("_wfreopen");
+            abort();
+        }
+
+        BOOL r = SetStdHandle(std_handle_id, (HANDLE)_get_osfhandle(fileno(file_handle)));
+        assert(r);
+
+        *std_handle = *file_handle;
+
+        assert(fileno(file_handle) == fileno(std_handle));
+
+        int stdout_dup = dup(fileno(std_handle));
+        if (stdout_dup >= 0) {
+            close(stdout_dup);
+        }
+
+        DWORD mode = 0;
+        if (GetConsoleMode((HANDLE)_get_osfhandle(fileno(std_handle)), &mode)) {
+            exit(66);
+        }
+    } else {
+        HANDLE w = CreateFileW(filename_buffer, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+                               CREATE_ALWAYS, 0, NULL);
+
+        if (w == INVALID_HANDLE_VALUE) {
+            printOSErrorMessage("standard handle failed to create", GetLastError());
+            abort();
+        }
+        BOOL r = SetStdHandle(std_handle_id, w);
+        assert(r);
+
+        int os_handle = _open_osfhandle((intptr_t)GetStdHandle(std_handle_id), O_WRONLY | O_TEXT);
+        if (os_handle == -1) {
+            perror("_open_osfhandle");
+            abort();
+        }
+
+        int int_res = dup2(os_handle, fileno(std_handle));
+
+        // Without a console, this is normal.
+        if (int_res == -1) {
+            perror("_open_osfhandle");
+            abort();
+        }
+
+        close(os_handle);
+    }
+
+    setvbuf(std_handle, NULL, _IOLBF, 4096);
+}
+#else
+static void changeStandardHandleTarget(FILE *std_handle, filename_char_t const *template) {
+    filename_char_t filename_buffer[1024];
+
+    bool res = expandTemplatePath(filename_buffer, template, sizeof(filename_buffer) / sizeof(filename_char_t));
+
+    if (res == false) {
+        printf("Error, couldn't expand pattern: '%s'\n", template);
+        abort();
+    }
+
+    int os_handle = open(filename_buffer, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+    if (os_handle == -1) {
+        perror("open");
+        abort();
+    }
+
+    int int_res = dup2(os_handle, fileno(std_handle));
+    if (int_res == -1) {
+        perror("dup2");
+        abort();
+    }
+
+    close(os_handle);
+}
+#endif
+#endif
+
 #ifdef _NUITKA_WINMAIN_ENTRY_POINT
 int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpCmdLine, int nCmdShow) {
     /* MSVC, MINGW64 */
@@ -974,8 +1144,31 @@ int wmain(int argc, wchar_t **argv) {
 int main(int argc, char **argv) {
 #endif
 #endif
-    NUITKA_PRINT_TIMING("main(): Entered.");
-    NUITKA_INIT_PROGRAM_EARLY(argc, argv);
+
+    // First things, set up stdout/stderr according to user specification.
+#if NUITKA_STANDARD_HANDLES_EARLY == 1
+#if defined(NUITKA_FORCED_STDOUT_PATH)
+#ifdef _WIN32
+    changeStandardHandleTarget(STD_OUTPUT_HANDLE, stdout, L"" NUITKA_FORCED_STDOUT_PATH);
+#else
+    changeStandardHandleTarget(stdout, NUITKA_FORCED_STDOUT_PATH);
+#endif
+#endif
+#if defined(NUITKA_FORCED_STDERR_PATH)
+#ifdef _WIN32
+    changeStandardHandleTarget(STD_ERROR_HANDLE, stderr, L"" NUITKA_FORCED_STDERR_PATH);
+#else
+    changeStandardHandleTarget(stderr, NUITKA_FORCED_STDERR_PATH);
+#endif
+#endif
+#if defined(NUITKA_FORCED_STDIN_PATH)
+#ifdef _WIN32
+    changeStandardHandleTarget(STD_INPUT_HANDLE, stdin, L"" NUITKA_FORCED_STDIN_PATH);
+#else
+    changeStandardHandleTarget(stdin, NUITKA_FORCED_STDIN_PATH);
+#endif
+#endif
+#endif
 
 #if SYSFLAG_UNBUFFERED == 1
     setbuf(stdin, (char *)NULL);
@@ -988,6 +1181,9 @@ int main(int argc, char **argv) {
 #endif
 #endif
 
+    NUITKA_PRINT_TIMING("main(): Entered.");
+    NUITKA_INIT_PROGRAM_EARLY(argc, argv);
+
 #ifdef __FreeBSD__
     /* FP exceptions run in "no stop" mode by default */
 
@@ -1149,6 +1345,10 @@ orig_argv = argv;
     setCommandLineParameters(argc, argv, false);
 
     PySys_SetArgv(argc, orig_argv);
+// Empty "sys.path" again, the above adds program directory to it.
+#if SYSFLAG_ISOLATED
+    Nuitka_SysSetObject("path", PyList_New(0));
+#endif
 
     /* Initialize the built-in module tricks used and builtin-type methods */
     NUITKA_PRINT_TRACE("main(): Calling _initBuiltinModule().");
@@ -1213,7 +1413,7 @@ orig_argv = argv;
     }
 #endif
 
-    NUITKA_PRINT_TRACE("main(): Setting input/output handles.");
+    NUITKA_PRINT_TRACE("main(): Setting Python input/output handles.");
     setInputOutputHandles();
 
 #ifdef _NUITKA_STANDALONE

nuitka/build/static_src/MetaPathBasedLoaderResourceReaderFiles.c

@@ -95,6 +95,12 @@ static PyObject *Nuitka_ResourceReaderFiles_iterdir(struct Nuitka_ResourceReader
     PyObject *file_names = OS_LISTDIR(file_path);
     Py_DECREF(file_path);
 
+    // TODO: Actually we ought to behave like a generator and delay this error,
+    // but we currently spare us the effort and raise this immediately.
+    if (unlikely(file_names == NULL)) {
+        return NULL;
+    }
+
     PyObject *files_objects = MAKE_LIST_EMPTY(0);
 
     Py_ssize_t n = PyList_GET_SIZE(file_names);

nuitka/build/static_src/OnefileBootstrap.c

@@ -29,6 +29,9 @@
 
 #if !defined(_WIN32)
 #define _POSIX_C_SOURCE 200809L
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #endif
 
 #ifdef __NUITKA_NO_ASSERT__
@@ -120,35 +123,13 @@
 // For tracing outputs if enabled at compile time.
 #include "nuitka/tracing.h"
 
-#ifdef _WIN32
-typedef DWORD error_code_t;
-static inline error_code_t getCurrentErrorCode(void) { return GetLastError(); }
-#else
-typedef int error_code_t;
-static inline error_code_t getCurrentErrorCode(void) { return errno; }
-#endif
-
-static void printError(char const *message, error_code_t error_code) {
-#if defined(_WIN32)
-    LPCTSTR err_buffer;
-
-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-                  error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&err_buffer, 0, NULL);
-
-    printf("%s ([Error %d] %s)\n", message, error_code, err_buffer);
-#else
-    printf("%s: %s\n", message, strerror(error_code));
-    perror(message);
-#endif
-}
-
 static void fatalError(char const *message) {
     puts(message);
     exit(2);
 }
 
 static void fatalIOError(char const *message, error_code_t error_code) {
-    printError(message, error_code);
+    printOSErrorMessage(message, error_code);
     exit(2);
 }
 
@@ -159,13 +140,6 @@ static void fatalErrorTempFiles(void) { fatalError("Error, couldn't runtime expa
 static void fatalErrorAttachedData(void) { fatalError("Error, couldn't decode attached data."); }
 #endif
 
-static void fatalErrorFindAttachedData(char const *erroring_function, error_code_t error_code) {
-    char buffer[1024] = "Error, couldn't find attached data:";
-    appendStringSafe(buffer, erroring_function, sizeof(buffer));
-
-    fatalIOError(buffer, error_code);
-}
-
 static void fatalErrorHeaderAttachedData(void) { fatalError("Error, could find attached data header."); }
 
 // Left over data in attached payload should not happen.
@@ -269,6 +243,13 @@ static void closePayloadData(void) {}
 
 #else
 
+static void fatalErrorFindAttachedData(char const *erroring_function, error_code_t error_code) {
+    char buffer[1024] = "Error, couldn't find attached data:";
+    appendStringSafe(buffer, erroring_function, sizeof(buffer));
+
+    fatalIOError(buffer, error_code);
+}
+
 static struct MapFileToMemoryInfo exe_file_mapped;
 
 static void initPayloadData(void) {
@@ -567,6 +548,7 @@ static bool createContainingDirectory(filename_char_t const *path) {
     return true;
 }
 
+#if _NUITKA_ONEFILE_TEMP_BOOL == 1
 #if defined(_WIN32)
 
 static bool isDirectory(wchar_t const *path) {
@@ -647,6 +629,7 @@ static int removeDirectory(char const *path) {
     return r;
 }
 #endif
+#endif
 
 #if !defined(_WIN32)
 static int waitpid_retried(pid_t pid, int *status, bool async) {
@@ -729,7 +712,7 @@ static void cleanupChildProcess(bool send_sigint) {
             FreeConsole();
 
             if (res == false) {
-                printError("Failed to send CTRL-C to child process.", GetLastError());
+                printOSErrorMessage("Failed to send CTRL-C to child process.", GetLastError());
                 // No error exit is done, we still want to cleanup when it does exit
             }
 #else
@@ -859,7 +842,7 @@ DWORD PrintError(const wchar_t* fnName)
         MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
         (LPWSTR)&errorMessage,
         0, NULL);
-    wprintf(L"%s failed (%d): %s", fnName, errorCode, errorMessage);
+    wprintf(L"%LS failed (%d): %LS", fnName, errorCode, errorMessage);
     LocalFree(errorMessage);
     return errorCode;
 }
@@ -1142,11 +1125,11 @@ int main(int argc, char **argv) {
             needs_write = false;
 
 #ifdef _NUITKA_EXPERIMENTAL_DEBUG_ONEFILE_CACHING
-            printf(stderr, "CACHE HIT for '" FILENAME_FORMAT_STR "'.", target_path);
+            fprintf(stderr, "CACHE HIT for '" FILENAME_FORMAT_STR "'.\n", target_path);
 #endif
         } else {
 #ifdef _NUITKA_EXPERIMENTAL_DEBUG_ONEFILE_CACHING
-            printf(stderr, "CACHE HIT for '" FILENAME_FORMAT_STR "'.", target_path);
+            fprintf(stderr, "CACHE MISS for '" FILENAME_FORMAT_STR "'.\n", target_path);
 #endif
         }
 #endif
@@ -1195,7 +1178,7 @@ int main(int argc, char **argv) {
             int res = fstat(fd, &stat_buffer);
 
             if (res == -1) {
-                printError("fstat", errno);
+                printOSErrorMessage("fstat", errno);
             }
 
             // User shall be able to execute if at least.
@@ -1213,7 +1196,7 @@ int main(int argc, char **argv) {
             res = fchmod(fd, stat_buffer.st_mode);
 
             if (res == -1) {
-                printError("fchmod", errno);
+                printOSErrorMessage("fchmod", errno);
             }
         }
 #endif

nuitka/build/static_src/OnefileSplashScreen.cpp

@@ -30,6 +30,7 @@
 #ifndef _NUITKA_NON_C11_MODE
 extern "C" {
 #endif
+#include "nuitka/filesystem_paths.h"
 #include "nuitka/safe_string_ops.h"
 #include "nuitka/tracing.h"
 #ifndef _NUITKA_NON_C11_MODE

nuitka/code_generation/AttributeCodes.py

@@ -29,7 +29,11 @@ from .CodeHelpers import (
     withObjectCodeTemporaryAssignment,
 )
 from .ErrorCodes import getErrorExitBoolCode, getErrorExitCode, getReleaseCode
-from .PythonAPICodes import generateCAPIObjectCode, generateCAPIObjectCode0
+from .PythonAPICodes import (
+    generateCAPIObjectCode,
+    generateCAPIObjectCode0,
+    makeArgDescFromExpression,
+)
 
 
 def generateAssignmentAttributeCode(statement, emit, context):
@@ -270,33 +274,52 @@ def generateAttributeCheckCode(to_name, expression, emit, context):
         expression=expression, emit=emit, context=context
     )
 
-    res_name = context.getBoolResName()
+    if expression.mayRaiseExceptionOperation():
+        res_name = context.getIntResName()
 
-    emit(
-        "%s = HAS_ATTR_BOOL(%s, %s);"
-        % (
-            res_name,
-            source_name,
-            context.getConstantCode(constant=expression.getAttributeName()),
+        emit(
+            "%s = HAS_ATTR_BOOL2(%s, %s);"
+            % (
+                res_name,
+                source_name,
+                context.getConstantCode(constant=expression.getAttributeName()),
+            )
         )
-    )
 
-    getReleaseCode(release_name=source_name, emit=emit, context=context)
+        getErrorExitBoolCode(
+            condition="%s == -1" % res_name,
+            release_name=source_name,
+            emit=emit,
+            context=context,
+        )
 
-    to_name.getCType().emitAssignmentCodeFromBoolCondition(
-        to_name=to_name, condition=res_name, emit=emit
-    )
+        to_name.getCType().emitAssignmentCodeFromBoolCondition(
+            to_name=to_name, condition="%s != 0" % res_name, emit=emit
+        )
+    else:
+        res_name = context.getBoolResName()
+
+        emit(
+            "%s = HAS_ATTR_BOOL(%s, %s);"
+            % (
+                res_name,
+                source_name,
+                context.getConstantCode(constant=expression.getAttributeName()),
+            )
+        )
+
+        getReleaseCode(release_name=source_name, emit=emit, context=context)
+
+        to_name.getCType().emitAssignmentCodeFromBoolCondition(
+            to_name=to_name, condition=res_name, emit=emit
+        )
 
 
 def generateBuiltinGetattrCode(to_name, expression, emit, context):
     generateCAPIObjectCode(
         to_name=to_name,
         capi="BUILTIN_GETATTR",
-        arg_desc=(
-            ("getattr_target", expression.subnode_expression),
-            ("getattr_attr", expression.subnode_name),
-            ("getattr_default", expression.subnode_default),
-        ),
+        arg_desc=makeArgDescFromExpression(expression),
         may_raise=expression.mayRaiseException(BaseException),
         conversion_check=decideConversionCheckNeeded(to_name, expression),
         source_ref=expression.getCompatibleSourceReference(),
@@ -310,11 +333,7 @@ def generateBuiltinSetattrCode(to_name, expression, emit, context):
     generateCAPIObjectCode0(
         to_name=to_name,
         capi="BUILTIN_SETATTR",
-        arg_desc=(
-            ("setattr_target", expression.subnode_expression),
-            ("setattr_attr", expression.subnode_attribute),
-            ("setattr_value", expression.subnode_value),
-        ),
+        arg_desc=makeArgDescFromExpression(expression),
         may_raise=expression.mayRaiseException(BaseException),
         conversion_check=decideConversionCheckNeeded(to_name, expression),
         source_ref=expression.getCompatibleSourceReference(),