Make O_* constants optional when they should be

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -603,7 +603,10 @@ int open(VirtualFrame frame, PosixPath path, int flags, int mode, int dirFd,
                         @Cached SysModuleBuiltins.AuditNode auditNode,
                         @Cached BranchProfile errorProfile,
                         @Cached GilNode gil) {
-            int fixedFlags = flags | O_CLOEXEC.value;
+            int fixedFlags = flags;
+            if (O_CLOEXEC.defined) {
+                fixedFlags |= O_CLOEXEC.getValueIfDefined();
+            }
             auditNode.audit("open", path.originalObject, PNone.NONE, fixedFlags);
             gil.release(true);
             try {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java

@@ -77,7 +77,6 @@
 import static com.oracle.graal.python.runtime.PosixConstants.NI_NAMEREQD;
 import static com.oracle.graal.python.runtime.PosixConstants.NI_NUMERICHOST;
 import static com.oracle.graal.python.runtime.PosixConstants.NI_NUMERICSERV;
-import static com.oracle.graal.python.runtime.PosixConstants.O_ACCMODE;
 import static com.oracle.graal.python.runtime.PosixConstants.O_APPEND;
 import static com.oracle.graal.python.runtime.PosixConstants.O_CREAT;
 import static com.oracle.graal.python.runtime.PosixConstants.O_DIRECT;
@@ -4168,7 +4167,7 @@ private static Set<PosixFilePermission> modeToPosixFilePermissions(int fileMode)
     @TruffleBoundary(allowInlining = true)
     private static Set<StandardOpenOption> flagsToOptions(int flags) {
         Set<StandardOpenOption> options = new HashSet<>();
-        int maskedFlags = flags & O_ACCMODE.value;
+        int maskedFlags = flags & (O_RDONLY.value | O_WRONLY.value | O_RDWR.value);
         if ((flags & O_APPEND.value) != 0) {
             options.add(StandardOpenOption.WRITE);
             options.add(StandardOpenOption.APPEND);
@@ -4197,10 +4196,10 @@ private static Set<StandardOpenOption> flagsToOptions(int flags) {
             options.add(StandardOpenOption.WRITE);
             options.add(StandardOpenOption.CREATE_NEW);
         }
-        if ((flags & O_NDELAY.value) != 0 || (O_DIRECT.defined && (flags & O_DIRECT.getValueIfDefined()) != 0)) {
+        if ((O_NDELAY.defined && (flags & O_NDELAY.getValueIfDefined()) != 0) || (O_DIRECT.defined && (flags & O_DIRECT.getValueIfDefined()) != 0)) {
             options.add(StandardOpenOption.DSYNC);
         }
-        if ((flags & O_SYNC.value) != 0) {
+        if (O_SYNC.defined && (flags & O_SYNC.getValueIfDefined()) != 0) {
             options.add(StandardOpenOption.SYNC);
         }
         if ((flags & O_TRUNC.value) != 0) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstants.java

@@ -97,20 +97,20 @@ public final class PosixConstants {
     public static final OptionalIntConstant SEEK_HOLE;
     public static final MandatoryIntConstant SOMAXCONN;
     public static final OptionalIntConstant PIPE_BUF;
-    public static final MandatoryIntConstant O_ACCMODE;
+    public static final OptionalIntConstant O_ACCMODE;
     public static final MandatoryIntConstant O_RDONLY;
     public static final MandatoryIntConstant O_WRONLY;
     public static final MandatoryIntConstant O_RDWR;
     public static final MandatoryIntConstant O_CREAT;
     public static final MandatoryIntConstant O_EXCL;
     public static final MandatoryIntConstant O_TRUNC;
     public static final MandatoryIntConstant O_APPEND;
-    public static final MandatoryIntConstant O_NONBLOCK;
-    public static final MandatoryIntConstant O_NOCTTY;
-    public static final MandatoryIntConstant O_NDELAY;
-    public static final MandatoryIntConstant O_DSYNC;
-    public static final MandatoryIntConstant O_CLOEXEC;
-    public static final MandatoryIntConstant O_SYNC;
+    public static final OptionalIntConstant O_NONBLOCK;
+    public static final OptionalIntConstant O_NOCTTY;
+    public static final OptionalIntConstant O_NDELAY;
+    public static final OptionalIntConstant O_DSYNC;
+    public static final OptionalIntConstant O_CLOEXEC;
+    public static final OptionalIntConstant O_SYNC;
     public static final OptionalIntConstant O_DIRECT;
     public static final OptionalIntConstant O_RSYNC;
     public static final OptionalIntConstant O_TMPFILE;
@@ -351,20 +351,20 @@ public final class PosixConstants {
         SEEK_HOLE = reg.createOptionalInt("SEEK_HOLE");
         SOMAXCONN = reg.createMandatoryInt("SOMAXCONN");
         PIPE_BUF = reg.createOptionalInt("PIPE_BUF");
-        O_ACCMODE = reg.createMandatoryInt("O_ACCMODE");
+        O_ACCMODE = reg.createOptionalInt("O_ACCMODE");
         O_RDONLY = reg.createMandatoryInt("O_RDONLY");
         O_WRONLY = reg.createMandatoryInt("O_WRONLY");
         O_RDWR = reg.createMandatoryInt("O_RDWR");
         O_CREAT = reg.createMandatoryInt("O_CREAT");
         O_EXCL = reg.createMandatoryInt("O_EXCL");
         O_TRUNC = reg.createMandatoryInt("O_TRUNC");
         O_APPEND = reg.createMandatoryInt("O_APPEND");
-        O_NONBLOCK = reg.createMandatoryInt("O_NONBLOCK");
-        O_NOCTTY = reg.createMandatoryInt("O_NOCTTY");
-        O_NDELAY = reg.createMandatoryInt("O_NDELAY");
-        O_DSYNC = reg.createMandatoryInt("O_DSYNC");
-        O_CLOEXEC = reg.createMandatoryInt("O_CLOEXEC");
-        O_SYNC = reg.createMandatoryInt("O_SYNC");
+        O_NONBLOCK = reg.createOptionalInt("O_NONBLOCK");
+        O_NOCTTY = reg.createOptionalInt("O_NOCTTY");
+        O_NDELAY = reg.createOptionalInt("O_NDELAY");
+        O_DSYNC = reg.createOptionalInt("O_DSYNC");
+        O_CLOEXEC = reg.createOptionalInt("O_CLOEXEC");
+        O_SYNC = reg.createOptionalInt("O_SYNC");
         O_DIRECT = reg.createOptionalInt("O_DIRECT");
         O_RSYNC = reg.createOptionalInt("O_RSYNC");
         O_TMPFILE = reg.createOptionalInt("O_TMPFILE");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstantsLinux.java

@@ -40,7 +40,7 @@
  */
 package com.oracle.graal.python.runtime;
 
-// Auto generated by gen_native_cfg.py at 2023-03-16 16:22:03.201868
+// Auto generated by gen_native_cfg.py at 2023-03-17 10:24:55.349775
 // on Linux arisu 6.1.18-200.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Sat Mar 11 16:09:14 UTC 2023 x86_64 x86_64
 class PosixConstantsLinux {
 

scripts/gen_native_cfg.py

@@ -142,20 +142,20 @@
 * i PIPE_BUF
 
 [openFlags]
-0 x O_ACCMODE
+* x O_ACCMODE
   x O_RDONLY
   x O_WRONLY
   x O_RDWR
   x O_CREAT
   x O_EXCL
   x O_TRUNC
   x O_APPEND
-0 x O_NONBLOCK
-0 x O_NOCTTY
-0 x O_NDELAY
-0 x O_DSYNC
-0 x O_CLOEXEC
-0 x O_SYNC
+* x O_NONBLOCK
+* x O_NOCTTY
+* x O_NDELAY
+* x O_DSYNC
+* x O_CLOEXEC
+* x O_SYNC
 * x O_DIRECT
 * x O_RSYNC
 * x O_TMPFILE