[flang-commits] [flang] ef2d59b - [Flang] malloc(1) on AIX as malloc(0) returns nullptr (#73878)

via flang-commits flang-commits at lists.llvm.org
Wed Dec 6 05:45:39 PST 2023


Author: madanial0
Date: 2023-12-06T08:45:35-05:00
New Revision: ef2d59b1456866f441d324ed81b208851df26ef4

URL: https://github.com/llvm/llvm-project/commit/ef2d59b1456866f441d324ed81b208851df26ef4
DIFF: https://github.com/llvm/llvm-project/commit/ef2d59b1456866f441d324ed81b208851df26ef4.diff

LOG: [Flang] malloc(1) on AIX as malloc(0) returns nullptr (#73878)

On AIX malloc(0) reutrns nullptr, which fails test case
`Evaluate/ISO-Fortran-binding.test`, using malloc(1) in AIX for
consistent behaviour

---------

Co-authored-by: Mark Danial <mark.danial at ibm.com>

Added: 
    

Modified: 
    flang/runtime/ISO_Fortran_binding.cpp

Removed: 
    


################################################################################
diff  --git a/flang/runtime/ISO_Fortran_binding.cpp b/flang/runtime/ISO_Fortran_binding.cpp
index ce146844533a0..99ba3aa56feee 100644
--- a/flang/runtime/ISO_Fortran_binding.cpp
+++ b/flang/runtime/ISO_Fortran_binding.cpp
@@ -75,7 +75,7 @@ RT_API_ATTRS int CFI_allocate(CFI_cdesc_t *descriptor,
     dim->sm = byteSize;
     byteSize *= extent;
   }
-  void *p{std::malloc(byteSize)};
+  void *p{byteSize ? std::malloc(byteSize) : std::malloc(1)};
   if (!p && byteSize) {
     return CFI_ERROR_MEM_ALLOCATION;
   }


        


More information about the flang-commits mailing list