changed munmap to return an ErrorOr

Author: uzairnawaz

libc/src/__support/OSUtil/linux/munmap.cpp

@@ -11,7 +11,7 @@
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/__support/common.h"
 
-#include "src/__support/libc_errno.h"
+#include "src/__support/error_or.h"
 #include "src/__support/macros/config.h"
 #include <sys/syscall.h> // For syscall numbers.
 
@@ -20,9 +20,14 @@ namespace internal {
 
 // This function is currently linux only. It has to be refactored suitably if
 // munmap is to be supported on non-linux operating systems also.
-int munmap(void *addr, size_t size) {
-  return LIBC_NAMESPACE::syscall_impl<int>(SYS_munmap,
-                                           reinterpret_cast<long>(addr), size);
+ErrorOr<int> munmap(void *addr, size_t size) {
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(
+      SYS_munmap, reinterpret_cast<long>(addr), size);
+
+  if (ret < 0)
+    return Error(-ret);
+
+  return 0;
 }
 
 } // namespace internal

libc/src/__support/OSUtil/munmap.h

@@ -9,13 +9,14 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_MUNMAP_H
 #define LLVM_LIBC_SRC___SUPPORT_OSUTIL_MUNMAP_H
 
+#include "src/__support/error_or.h"
 #include "src/__support/macros/config.h"
 #include <sys/mman.h> // For size_t and off_t
 
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 
-int munmap(void *addr, size_t size);
+ErrorOr<int> munmap(void *addr, size_t size);
 
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL

libc/src/__support/OSUtil/prctl.h

@@ -9,16 +9,16 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_PRCTL_H
 #define LLVM_LIBC_SRC___SUPPORT_OSUTIL_PRCTL_H
 
-#include "src/__support/macros/config.h"
 #include "src/__support/error_or.h"
-#include <sys/prctl.h>
 #include "src/__support/libc_errno.h"
+#include "src/__support/macros/config.h"
+#include <sys/prctl.h>
 
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 
 ErrorOr<int> prctl(int option, unsigned long arg2, unsigned long arg3,
-          unsigned long arg4, unsigned long arg5);
+                   unsigned long arg4, unsigned long arg5);
 
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL

libc/src/sys/auxv/linux/CMakeLists.txt

@@ -15,4 +15,4 @@ add_entrypoint_object(
     libc.src.unistd.read
     libc.src.unistd.close
     libc.include.sys_auxv
-)
+)

libc/src/sys/mman/linux/munmap.cpp

@@ -15,16 +15,16 @@
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, munmap, (void *addr, size_t size)) {
-  int ret = internal::munmap(addr, size);
+  auto ret = internal::munmap(addr, size);
 
   // A negative return value indicates an error with the magnitude of the
   // value being the error code.
-  if (ret < 0) {
-    libc_errno = -ret;
+  if (!ret.has_value()) {
+    libc_errno = ret.error();
     return -1;
   }
 
-  return 0;
+  return ret.value();
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/sys/prctl/linux/prctl.cpp

@@ -9,8 +9,8 @@
 #include "src/sys/prctl/prctl.h"
 
 #include "src/__support/OSUtil/prctl.h"
-#include "src/__support/libc_errno.h"
 #include "src/__support/common.h"
+#include "src/__support/libc_errno.h"
 
 namespace LIBC_NAMESPACE_DECL {