CHANGELOG

@@ -1,15 +1,3 @@
-2014-04-28    0.12.5:
----------------------
-  * Fixes memory leaks (#92)
-  * Fixes tarball (#99)
-
-2014-03-20    0.12.4:
----------------------
-  * Add dylib_import_library and friends
-  * Fix BasicBlock downcast
-  * Module hashing
-  * Fix test script
-
 2014-02-18    0.12.3:
 ---------------------
   * Fix deprecation message for py2.6

MANIFEST.in

@@ -1,6 +1,5 @@
-include CHANGELOG LICENSE README.rst setup.py MANIFEST.in versioneer.py
+include CHANGELOG LICENSE README setup.py MANIFEST.in
 recursive-include llvm *
-recursive-include llvmpy *
 recursive-include www *
 recursive-include test *
 recursive-include tools *

README.rst

@@ -30,14 +30,11 @@ Quickstart
     to separate your custom build from the default system package.  Please
     replace ``LLVM_INSTALL_PATH`` with your own path.
 
-3. Run ``REQUIRES_RTTI=1 make install`` to build and install.
+3. Run ``REQUIRES_RTTI=1 make`` to build.
 
     **Note**: With LLVM 3.2, the default build configuration has C++ RTTI 
     disabled.  However, llvmpy requires RTTI.
 
-    **Note**: Use ``make -j2 install`` to enable concurrent build.  
-    Replace ``2`` with the actual number of processor you have. 
-
 4. Get llvm-py and install it::
 
    $ git clone git@github.com:llvmpy/llvmpy.git

buildscripts/condarecipe/run_test.py

@@ -15,8 +15,8 @@ if sys.platform == 'darwin':
     s = {'64bit': 'x86_64', '32bit': 'x86'}[platform.architecture()[0]]
     assert target.triple.startswith(s + '-apple-darwin')
 
-assert llvm.test(verbosity=2, run_isolated=False) == 0
-#check_intrinsics.main()
+assert llvm.test(verbosity=2) == 0
+check_intrinsics.main()
 
 print('llvm.__version__: %s' % llvm.__version__)
 #assert llvm.__version__ == '0.12.0'

llvm/__init__.py

@@ -34,14 +34,14 @@ def _extract_ptrs(objs):
 class LLVMException(Exception):
     pass
 
-def test(verbosity=3, run_isolated=True):
+def test(verbosity=3):
     """test(verbosity=1) -> TextTestResult
 
         Run self-test, and return the number of failures + errors
         """
     from llvm.tests import run
 
-    result = run(verbosity=verbosity, run_isolated=run_isolated)
+    result = run(verbosity=verbosity)
     errct = len(result.failures) + len(result.errors)
 
     return errct

llvm/core.py

@@ -452,12 +452,12 @@ class Module(llvm.Wrapper):
             """
         return str(self._ptr)
 
-    def __hash__(self):
-        return id(self._ptr)
-
     def __eq__(self, rhs):
+        assert isinstance(rhs, Module), type(rhs)
         if isinstance(rhs, Module):
-            return self._ptr == rhs._ptr
+            return str(self) == str(rhs)
+        else:
+            return False
 
     def __ne__(self, rhs):
         return not (self == rhs)

llvm/ee.py

@@ -238,27 +238,3 @@ def dylib_add_symbol(name, ptr):
 
 def dylib_address_of_symbol(name):
     return api.llvm.sys.DynamicLibrary.SearchForAddressOfSymbol(name)
-
-def dylib_import_library(filename):
-    """Permanently import a dynamic library.
-
-    Returns a DynamicLibrary object
-
-    Raises RuntimeError
-    """
-    return DynamicLibrary(filename)
-
-
-class DynamicLibrary(object):
-    def __init__(self, filename):
-        """
-        Raises RuntimeError
-        """
-        self._ptr = api.llvm.sys.DynamicLibrary.getPermanentLibrary(
-            filename)
-
-    def get_address_of_symbol(self, symbol):
-        """
-        Get the address of `symbol` (str) as integer
-        """
-        return self._ptr.getAddressOfSymbol(symbol)

llvm/tests/__init__.py

@@ -12,7 +12,7 @@ tests = []  # stores unittest.TestCase objects
 isolated_tests = []  # stores modue name
 
 
-def run(verbosity=1, run_isolated=True):
+def run(verbosity=1):
     print('llvmpy is installed in: ' + os.path.dirname(__file__))
     print('llvmpy version: ' + llvm.__version__)
     print(sys.version)
@@ -48,7 +48,7 @@ def run(verbosity=1, run_isolated=True):
         testresult = runner.run(suite)
         print(hp.heap())
 
-    if testresult and run_isolated:
+    if testresult:
         # Run isolated tests
         print("run isolated tests".center(80, '-'))
 

llvmpy/include/llvm_binding/extra.h

@@ -186,8 +186,8 @@ PyObject* iterator_to_pylist_deref(iterator begin, iterator end,
 {
     PyObject* list = PyList_New(0);
     for(; begin != end; ++begin) {
-        auto_pyobject cap = pycapsule_new(&*begin, capsuleName, className);
-        PyList_Append(list, *cap);
+        PyObject* cap = pycapsule_new(&*begin, capsuleName, className);
+        PyList_Append(list, cap);
     }
     return list;
 }
@@ -198,8 +198,8 @@ PyObject* iterator_to_pylist(iterator begin, iterator end,
 {
     PyObject* list = PyList_New(0);
     for(; begin != end; ++begin) {
-        auto_pyobject cap = pycapsule_new(*begin, capsuleName, className);
-        PyList_Append(list, *cap);
+        PyObject* cap = pycapsule_new(*begin, capsuleName, className);
+        PyList_Append(list, cap);
     }
     return list;
 }
@@ -575,11 +575,11 @@ PyObject* TargetMachine_addPassesToEmitFile(
     bool status = TM->addPassesToEmitFile(PM, fso, FTy, disableVerify);
     if (status) {
         StringRef sr = rso.str();
-        auto_pyobject buf = PyString_FromStringAndSize(sr.data(), sr.size());
+        PyObject* buf = PyString_FromStringAndSize(sr.data(), sr.size());
         if (!buf) {
             return NULL;
         }
-        if (-1 == PyFile_WriteObject(*buf, Out, Py_PRINT_RAW)){
+        if (-1 == PyFile_WriteObject(buf, Out, Py_PRINT_RAW)){
             return NULL;
         }
         Py_RETURN_TRUE;
@@ -861,27 +861,6 @@ PyObject* DynamicLibrary_LoadLibraryPermanently(const char * Filename,
     }
 }
 
-static
-PyObject* DynamicLibrary_getPermanentLibrary(const char * Filename,
-                                                PyObject* ErrMsg = 0)
-{
-    using namespace llvm::sys;
-    std::string errmsg;
-    DynamicLibrary dylib = DynamicLibrary::getPermanentLibrary(Filename, &errmsg);
-    if (!dylib.isValid()) {
-        if (ErrMsg) {
-            auto_pyobject buf = PyBytes_FromString(errmsg.c_str());
-            if (!callwrite(ErrMsg, *buf))
-                return NULL;
-        }
-        PyErr_SetString(PyExc_RuntimeError, errmsg.c_str());
-        return NULL;
-    }
-    return pycapsule_new(new DynamicLibrary(dylib),
-                     "llvm::sys::DynamicLibrary",
-                     "llvm::sys::DynamicLibrary");
-}
-
 class PassRegistryEnumerator : public llvm::PassRegistrationListener{
 public:
     PyObject* List;
@@ -891,8 +870,7 @@ public:
     inline virtual void passEnumerate(const llvm::PassInfo * pass_info){
         PyObject* passArg = PyString_FromString(pass_info->getPassArgument());
         PyObject* passName = PyString_FromString(pass_info->getPassName());
-        auto_pyobject pair = Py_BuildValue("(OO)", passArg, passName);
-        PyList_Append(List, *pair);
+        PyList_Append(List, Py_BuildValue("(OO)", passArg, passName));
     }
 };
 

llvmpy/src/BasicBlock.py

@@ -1,13 +1,12 @@
 from binding import *
 from .namespace import llvm
-from .Value import Function, BasicBlock, Value
+from .Value import Function, BasicBlock
 from .Instruction import Instruction, TerminatorInst
 from .LLVMContext import LLVMContext
 from .ADT.StringRef import StringRef
 
 @BasicBlock
 class BasicBlock:
-    _downcast_ = Value
     Create = StaticMethod(ptr(BasicBlock), ref(LLVMContext),
                           cast(str, StringRef),
                           ptr(Function),

llvmpy/src/Support/DynamicLibrary.py

@@ -26,10 +26,3 @@ class DynamicLibrary:
                              cast(str, StringRef), # symbolName
                              cast(int, VoidPtr),   # address
                              )
-
-    getPermanentLibrary = CustomStaticMethod(
-                          'DynamicLibrary_getPermanentLibrary',
-                          PyObjectPtr,
-                          cast(str, ConstCharPtr), # filename
-                          PyObjectPtr,             # std::string * errmsg = 0
-                          ).require_only(1)