[llvm] r194965 - python: Fix check for disasm creation failure

[Anders Waldenborg]

Author: andersg
Date: Sun Nov 17 09:40:57 2013
New Revision: 194965

URL: http://llvm.org/viewvc/llvm-project?rev=194965&view=rev
Log:
python: Fix check for disasm creation failure

Check should be for pointer being NULL, not what it points to.

Also adds a test for this case.

Reviewed By: indygreg

Differential Revision: http://llvm-reviews.chandlerc.com/D1878


Modified:
    llvm/trunk/bindings/python/llvm/disassembler.py
    llvm/trunk/bindings/python/llvm/tests/test_disassembler.py

Modified: llvm/trunk/bindings/python/llvm/disassembler.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/python/llvm/disassembler.py?rev=194965&r1=194964&r2=194965&view=diff
==============================================================================
--- llvm/trunk/bindings/python/llvm/disassembler.py (original)
+++ llvm/trunk/bindings/python/llvm/disassembler.py Sun Nov 17 09:40:57 2013
@@ -75,7 +75,7 @@ class Disassembler(LLVMObject):
 
         ptr = lib.LLVMCreateDisasm(c_char_p(triple), c_void_p(None), c_int(0),
                 callbacks['op_info'](0), callbacks['symbol_lookup'](0))
-        if not ptr.contents:
+        if not ptr:
             raise Exception('Could not obtain disassembler for triple: %s' %
                             triple)
 

Modified: llvm/trunk/bindings/python/llvm/tests/test_disassembler.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/python/llvm/tests/test_disassembler.py?rev=194965&r1=194964&r2=194965&view=diff
==============================================================================
--- llvm/trunk/bindings/python/llvm/tests/test_disassembler.py (original)
+++ llvm/trunk/bindings/python/llvm/tests/test_disassembler.py Sun Nov 17 09:40:57 2013
@@ -16,6 +16,10 @@ class TestDisassembler(TestBase):
         self.assertEqual(count, 3)
         self.assertEqual(s, '\tjcxz\t-127')
 
+    def test_nonexistant_triple(self):
+        with self.assertRaisesRegexp(Exception, "Could not obtain disassembler for triple"):
+            Disassembler("nonexistant-triple-raises")
+
     def test_get_instructions(self):
         sequence = '\x67\xe3\x81\x01\xc7' # jcxz -127; addl %eax, %edi