Module: Mesa
Branch: master
Commit: 0a6a17b9d72c57f0840d91756924632fee91f2c2
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a6a17b9d72c57f0840d91756924632fee91f2c2

Author: Nicolai Hähnle <[email protected]>
Date:   Mon Dec 14 16:10:31 2015 -0500

gallium/radeon: only dispose locally created target machine in 
radeon_llvm_compile

Unify the cleanup paths of the function rather than duplicating code.

Cc: "11.0 11.1" <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>

---

 src/gallium/drivers/radeon/radeon_llvm_emit.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c 
b/src/gallium/drivers/radeon/radeon_llvm_emit.c
index 6b2ebde..61ed940 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_emit.c
+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c
@@ -188,8 +188,8 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct 
radeon_shader_binary *binar
        if (mem_err) {
                fprintf(stderr, "%s: %s", __FUNCTION__, err);
                FREE(err);
-               LLVMDisposeTargetMachine(tm);
-               return 1;
+               rval = 1;
+               goto out;
        }
 
        if (0 != rval) {
@@ -205,6 +205,7 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct 
radeon_shader_binary *binar
        /* Clean up */
        LLVMDisposeMemoryBuffer(out_buffer);
 
+out:
        if (dispose_tm) {
                LLVMDisposeTargetMachine(tm);
        }

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to