summaryrefslogtreecommitdiffstats
path: root/bindings
diff options
context:
space:
mode:
authorGregory Szorc <gregory.szorc@gmail.com>2012-03-09 18:56:33 +0000
committerGregory Szorc <gregory.szorc@gmail.com>2012-03-09 18:56:33 +0000
commit07c32218f448b7637d4acad8e87ce7cfaef0277e (patch)
tree09b98f3a686f3007b5a47266efe414b6d86712b0 /bindings
parent5992f67e683b665392f45b167fe5c9abd91455c9 (diff)
downloadexternal_llvm-07c32218f448b7637d4acad8e87ce7cfaef0277e.zip
external_llvm-07c32218f448b7637d4acad8e87ce7cfaef0277e.tar.gz
external_llvm-07c32218f448b7637d4acad8e87ce7cfaef0277e.tar.bz2
[llvm.py] Make ObjectFile destructor work
Previous code had a double free in MemoryBuffer. The tests now pass. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152422 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'bindings')
-rw-r--r--bindings/python/llvm/common.py14
-rw-r--r--bindings/python/llvm/core.py15
-rw-r--r--bindings/python/llvm/object.py21
3 files changed, 33 insertions, 17 deletions
diff --git a/bindings/python/llvm/common.py b/bindings/python/llvm/common.py
index 7818ff4..fe35bf1 100644
--- a/bindings/python/llvm/common.py
+++ b/bindings/python/llvm/common.py
@@ -7,20 +7,24 @@
#
#===------------------------------------------------------------------------===#
+from ctypes import POINTER
+from ctypes import c_void_p
from ctypes import cdll
import ctypes.util
-import platform
__all__ = [
- "find_library",
- "get_library",
+ 'LLVMObject',
+ 'find_library',
+ 'get_library',
]
+LLVMObject = POINTER(c_void_p)
+
def find_library():
# FIXME should probably have build system define absolute path of shared
# library at install time.
- for lib in ["LLVM-3.1svn", "LLVM"]:
+ for lib in ['LLVM-3.1svn', 'LLVM']:
result = ctypes.util.find_library(lib)
if result:
return result
@@ -32,6 +36,6 @@ def get_library():
"""Obtain a reference to the llvm library."""
lib = find_library()
if not lib:
- raise Exception("LLVM shared library not found!")
+ raise Exception('LLVM shared library not found!')
return cdll.LoadLibrary(lib)
diff --git a/bindings/python/llvm/core.py b/bindings/python/llvm/core.py
index 5a3bd51..bd9f8aa 100644
--- a/bindings/python/llvm/core.py
+++ b/bindings/python/llvm/core.py
@@ -7,6 +7,7 @@
#
#===------------------------------------------------------------------------===#
+from .common import LLVMObject
from .common import get_library
from ctypes import POINTER
@@ -33,7 +34,7 @@ class MemoryBuffer(object):
if filename is None:
raise Exception("filename argument must be defined")
- memory = c_void_p(None)
+ memory = LLVMObject()
out = c_char_p(None)
result = lib.LLVMCreateMemoryBufferWithContentsOfFile(filename,
@@ -43,17 +44,23 @@ class MemoryBuffer(object):
raise Exception("Could not create memory buffer: %s" % out.value)
self._memory = memory
+ self._as_parameter_ = self._memory
+ self._owned = True
def __del__(self):
- lib.LLVMDisposeMemoryBuffer(self._memory)
+ if self._owned:
+ lib.LLVMDisposeMemoryBuffer(self._memory)
def from_param(self):
- return self._memory
+ return self._as_parameter_
+
+ def release_ownership(self):
+ self._owned = False
def register_library(library):
library.LLVMCreateMemoryBufferWithContentsOfFile.argtypes = [c_char_p,
- POINTER(c_void_p), POINTER(c_char_p)]
+ POINTER(LLVMObject), POINTER(c_char_p)]
library.LLVMCreateMemoryBufferWithContentsOfFile.restype = bool
library.LLVMDisposeMemoryBuffer.argtypes = [c_void_p]
diff --git a/bindings/python/llvm/object.py b/bindings/python/llvm/object.py
index a55a5cb..f633f60 100644
--- a/bindings/python/llvm/object.py
+++ b/bindings/python/llvm/object.py
@@ -11,6 +11,7 @@ from ctypes import c_char_p
from ctypes import c_uint64
from ctypes import c_void_p
+from .common import LLVMObject
from .common import get_library
from .core import MemoryBuffer
@@ -40,9 +41,14 @@ class ObjectFile(object):
self._memory = contents
self._obj = lib.LLVMCreateObjectFile(contents)
+ contents.release_ownership()
+ self._as_parameter_ = self._obj
def __del__(self):
- lib.LLVMDisposeObjectFile(self._obj)
+ lib.LLVMDisposeObjectFile(self)
+
+ def from_param(self):
+ return self._as_parameter_
def get_sections(self):
"""Obtain the sections in this object file.
@@ -143,7 +149,6 @@ class Relocation(object):
def value_string(self):
pass
-ObjectFileRef = c_void_p
SectionIteratorRef = c_void_p
SymbolIteratorRef = c_void_p
RelocationIteratorRef = c_void_p
@@ -153,16 +158,16 @@ def register_library(library):
# Object.h functions
library.LLVMCreateObjectFile.argtypes = [MemoryBuffer]
- library.LLVMCreateObjectFile.restype = ObjectFileRef
+ library.LLVMCreateObjectFile.restype = LLVMObject
- library.LLVMDisposeObjectFile.argtypes = [ObjectFileRef]
+ library.LLVMDisposeObjectFile.argtypes = [ObjectFile]
- library.LLVMGetSections.argtypes = [ObjectFileRef]
+ library.LLVMGetSections.argtypes = [ObjectFile]
library.LLVMGetSections.restype = SectionIteratorRef
library.LLVMDisposeSectionIterator.argtypes = [SectionIteratorRef]
- library.LLVMIsSectionIteratorAtEnd.argtypes = [ObjectFileRef,
+ library.LLVMIsSectionIteratorAtEnd.argtypes = [ObjectFile,
SectionIteratorRef]
library.LLVMIsSectionIteratorAtEnd.restype = bool
@@ -171,12 +176,12 @@ def register_library(library):
library.LLVMMoveToContainingSection.argtypes = [SectionIteratorRef,
SymbolIteratorRef]
- library.LLVMGetSymbols.argtypes = [ObjectFileRef]
+ library.LLVMGetSymbols.argtypes = [ObjectFile]
library.LLVMGetSymbols.restype = SymbolIteratorRef
library.LLVMDisposeSymbolIterator.argtypes = [SymbolIteratorRef]
- library.LLVMIsSymbolIteratorAtEnd.argtypes = [ObjectFileRef,
+ library.LLVMIsSymbolIteratorAtEnd.argtypes = [ObjectFile,
SymbolIteratorRef]
library.LLVMIsSymbolIteratorAtEnd.restype = bool