Merge pull request #448 from LLNL/asan-fixes

Fixes from Address Sanitize (asan)

Author: ltaylor16

docs/input.rst

@@ -549,6 +549,15 @@ variable ``void *ptr`` available as the pointer to the memory
 to be released.
 See :ref:`MemoryManagementAnchor` for details.
 
+.. code-block:: yaml
+
+    declarations:
+    - decl: char *getName() +destructor_name(free_getName)
+
+    destructors:
+       free_getName: |
+          decref(ptr);
+
 ..  and *intent(out)* arguments.
 
 dimension

docs/releases.rst

@@ -88,6 +88,15 @@ Changes to YAML input
   Current use of *+free_pattern* is still supported but will
   create a warning message in the logfile. The old usage will be
   removed in a future version.
+
+.. code-block:: yaml
+
+    declarations:
+    - decl: char *getName() +destructor_name(free_getName)
+
+    destructors:
+       free_getName: |
+          decref(ptr);
   
 * Create an abstract interface for typedef statements which
   are function pointers. Previously, only function pointers
@@ -300,7 +309,8 @@ F_flatten_namespace           flatten_namespace
      option:
        F_result_as_arg: output
      - decl: const char *getConstCharPtrAsCopyArg() +funcarg+deref(copy)
-   
+
+
 * The **c_helper** and **f_helper** statement fields are merged into **helper**.
   A helper may have a C and Fortran part. This required the helper to
   be listed twice. Now it only needs to be listed once.

regression/input/char.yaml

@@ -256,10 +256,3 @@ patterns:
     # return a blank field string if an error occurs
     C_invalid_name_buf: |
         // Some error code for buf
-
-     # This pattern is added to C_memory_dtor_function
-     # XXX - \t is not dealt with properly
-    C_string_free: |
-        // Used with +free_pattern(C_string_free)
-        std::string *cxx_ptr = reinterpret_cast<std::string *>(ptr);
-        delete cxx_ptr;

regression/input/cxxlibrary.yaml

@@ -125,6 +125,7 @@ declarations:
   declarations:
   - decl: int m_length +readonly +name(length);
   - decl: Class1()
+  - decl: ~Class1()
 
   - decl: int check_length(int length = 1)
     doxygen:

regression/input/ownership.yaml

@@ -102,7 +102,7 @@ declarations:
 #    deref: pointer
     dimension: len
     owner: caller
-#    C_free_pattern: delete_int_array
+    destructor_name: delete_int_array
   options:
     wrap_fortran: False
     wrap_lua: False
@@ -113,7 +113,7 @@ declarations:
     deref: pointer
     dimension: len
     owner: caller
-#    C_free_pattern: delete_int_array
+    destructor_name: delete_int_array
   options:
     wrap_lua: False
 
@@ -122,7 +122,7 @@ declarations:
     deref: allocatable
     dimension: len
     owner: caller
-#    C_free_pattern: delete_int_array
+    destructor_name: delete_int_array
   options:
     wrap_fortran: False
     wrap_lua: False
@@ -131,7 +131,7 @@ declarations:
   fattrs:
     dimension: len
     owner: caller
-#    C_free_pattern: delete_int_array
+    destructor_name: delete_int_array
   options:
     wrap_lua: False
   # deref("pointer") will be defaulted, return as a Fortran POINTER.
@@ -201,7 +201,7 @@ declarations:
       intent: out
       deref: raw
       owner: caller
-#    C_free_pattern: delete_int_array
+      destructor_name: delete_int_array
   options:
     wrap_c: False
     wrap_fortran: False
@@ -215,7 +215,7 @@ declarations:
       deref: pointer
       dimension: len
       owner: caller
-#    C_free_pattern: delete_int_array
+      destructor_name: delete_int_array
   options:
     wrap_c: False
     wrap_fortran: False
@@ -229,7 +229,7 @@ declarations:
       deref: allocatable
       dimension: len
       owner: caller
-#    C_free_pattern: delete_int_array
+      destructor_name: delete_int_array
   options:
     wrap_c: False
     wrap_fortran: False
@@ -242,7 +242,7 @@ declarations:
       intent: out
       dimension: len
       owner: caller
-#     C_free_pattern: delete_int_array
+      destructor_name: delete_int_array
   options:
     wrap_c: False
     wrap_fortran: False
@@ -272,7 +272,7 @@ declarations:
 
 
 
-patterns:
+destructors:
    delete_int_array: |
        int * cxx_ptr = reinterpret_cast<int *>(ptr);
        delete [] cxx_ptr;

regression/reference/char-cxx-cfi/char.json

@@ -5472,8 +5472,7 @@
         "language": "cxx",
         "patterns": {
             "C_invalid_name": "if ({cxx_var}.empty()) {{\n    return NULL;\n}}\n",
-            "C_invalid_name_buf": "// Some error code for buf\n",
-            "C_string_free": "// Used with +free_pattern(C_string_free)\nstd::string *cxx_ptr = reinterpret_cast<std::string *>(ptr);\ndelete cxx_ptr;\n"
+            "C_invalid_name_buf": "// Some error code for buf\n"
         },
         "scope_file": [
             "char"

regression/reference/char-cxx/char.json

@@ -6137,8 +6137,7 @@
         "language": "cxx",
         "patterns": {
             "C_invalid_name": "if ({cxx_var}.empty()) {{\n    return NULL;\n}}\n",
-            "C_invalid_name_buf": "// Some error code for buf\n",
-            "C_string_free": "// Used with +free_pattern(C_string_free)\nstd::string *cxx_ptr = reinterpret_cast<std::string *>(ptr);\ndelete cxx_ptr;\n"
+            "C_invalid_name_buf": "// Some error code for buf\n"
         },
         "scope_file": [
             "char"

regression/reference/classes/wrapClass1.cpp

@@ -368,6 +368,7 @@ void CLA_Class1_getName_bufferify(CLA_Class1 * self,
     ShroudStringToCdesc(SHT_rv_cdesc, &SHC_rv_cxx);
     SHT_rv_capsule->addr  = const_cast<std::string *>(&SHC_rv_cxx);
     SHT_rv_capsule->idtor = 0;
+    SHT_rv_capsule->cmemflags = SWIG_MEM_RVALUE;
     // splicer end class.Class1.method.getName_bufferify
 }
 // end CLA_Class1_getName_bufferify
@@ -391,6 +392,7 @@ const char * CLA_Class1_getPath(const CLA_Class1 * self,
     if (!SHC_rv_cxx->empty()) SHC_rv = SHC_rv_cxx->c_str();
     SHT_rv_capsule->addr  = SHC_rv_cxx;
     SHT_rv_capsule->idtor = 2;
+    SHT_rv_capsule->cmemflags = SWIG_MEM_RVALUE;
     return SHC_rv;
     // splicer end class.Class1.method.getPath
 }

regression/reference/classes/wrapClass2.cpp

@@ -76,6 +76,7 @@ void CLA_Class2_getName_bufferify(CLA_Class2 * self,
     ShroudStringToCdesc(SHT_rv_cdesc, &SHC_rv_cxx);
     SHT_rv_capsule->addr  = const_cast<std::string *>(&SHC_rv_cxx);
     SHT_rv_capsule->idtor = 0;
+    SHT_rv_capsule->cmemflags = SWIG_MEM_RVALUE;
     // splicer end class.Class2.method.getName_bufferify
 }
 

regression/reference/classes/wrapclasses.cpp

@@ -320,7 +320,7 @@ void CLA_getClass1Copy_bufferify(int flag, CLA_Class1 *SHC_rv)
     *SHC_rv_cxx = classes::getClass1Copy(flag);
     SHC_rv->addr  = SHC_rv_cxx;
     SHC_rv->idtor = 1;
-    SHC_rv->cmemflags = SWIG_MEM_RVALUE;
+    SHC_rv->cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE;
     // splicer end function.getClass1Copy_bufferify
 }