Fix break introduced in 14735ca

[rgiese]

Summary

The File::OpenOptions were renamed; this fixes up a callsite that breaks for macOS builds. (See https://github.com/llvm/llvm-project/commit/14735cab655441ba45c4b88ad82f11267e5fe916)

[teemperor]

LGTM, thanks. I assume you don't have commit access so I'll land this for you in a minute :)

[mgorny]

I'm sorry about missing this.

lldb/source/Plugins/Platform/MacOSX/objcxx/PlatformiOSSimulatorCoreSimulatorSupport.mm

427–433

[rgiese]

@teemperor please hold while I figure out how to update the patch with @mgorny 's cleaner suggestion. :)

[teemperor]

My bad, I missed that the patch isn't just renaming but actually adding a new option. Let me run the tests with the proposed change (feel free to update the review in the meantime)

[rgiese]

Incorporating feedback.

[rgiese]

Trying this patch-of-a-patch thing again.

[teemperor]

I'm landing this to unbreak Green Dragon.

@mgorny Just a heads up, I think this also broke one test with debugserver:

======================================================================
FAIL: test_platform_file_wronly_trunc_debugserver (TestGdbRemotePlatformFile.TestGdbRemotePlatformFile)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/teemperor/1llvm/llvm-project/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py", line 52, in test_method
    return attrvalue(self)
  File "/Users/teemperor/1llvm/llvm-project/lldb/packages/Python/lldbsuite/test/decorators.py", line 119, in wrapper
    func(*args, **kwargs)
  File "/Users/teemperor/1llvm/llvm-project/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py", line 42, in test_platform_file_wronly_trunc
    self.vFile_test(write=True, trunc=True)
  File "/Users/teemperor/1llvm/llvm-project/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py", line 146, in vFile_test
    context = self.expect_gdbremote_sequence()
  File "/Users/teemperor/1llvm/llvm-project/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py", line 621, in expect_gdbremote_sequence
    return expect_lldb_gdbserver_replay(
  File "/Users/teemperor/1llvm/llvm-project/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py", line 198, in expect_lldb_gdbserver_replay
    context = sequence_entry.assert_match(
  File "/Users/teemperor/1llvm/llvm-project/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py", line 479, in assert_match
    return self._assert_regex_match(asserter, actual_packet, context)
  File "/Users/teemperor/1llvm/llvm-project/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py", line 446, in _assert_regex_match
    asserter.fail(
AssertionError: regex '^\$F([0-9a-fA-F]+)#[0-9a-fA-F]{2}$' failed to match against content '$#00'
Config=x86_64-/Users/teemperor/1llvm/rel/bin/clang
--------------------------------------------------------

( TestGdbRemotePlatformFile's different subtests fail with same/similar errors).

[mgorny]

Thanks!

lldb/source/Plugins/Platform/MacOSX/objcxx/PlatformiOSSimulatorCoreSimulatorSupport.mm

case FileAction::eFileActionOpen: {
             return error; // Success
           }
         }
         Status posix_error;
         int oflag = file_action->GetActionArgument();
         int created_fd =
             open(file_spec.GetPath().c_str(), oflag, S_IRUSR | S_IWUSR);
         if (created_fd >= 0) {
           auto file_options = File::OpenOptions(0);
-          if ((oflag & O_RDWR) || (oflag & O_RDONLY))
-            file_options |= File::eOpenOptionRead;
-          if ((oflag & O_RDWR) || (oflag & O_RDONLY))
-            file_options |= File::eOpenOptionWrite;
+          if (oflag & O_RDWR)
+            file_options |= File::eOpenOptionReadWrite;
+          else if (oflag & O_WRONLY)
+            file_options |= File::eOpenOptionWriteOnly;
+          else if (oflag & O_RDONLY)
+            file_options |= File::eOpenOptionReadOnly;
           file = std::make_shared<NativeFile>(created_fd, file_options, true);
           [options setValue:[NSNumber numberWithInteger:created_fd] forKey:key];
           return error; // Success
         } else {
           posix_error.SetErrorToErrno();
           error.SetErrorStringWithFormat("unable to open file '%s': %s",
                                          file_spec.GetPath().c_str(),
                                          posix_error.AsCString());