[llvm-commits] [llvm-gcc-4.2] r49172 - /llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

[Dale Johannesen]

Author: johannes
Date: Thu Apr  3 12:29:44 2008
New Revision: 49172

URL: http://llvm.org/viewvc/llvm-project?rev=49172&view=rev
Log:
Fix a type mismatch in ObjC exception handling.
Approved by Fariborz offline.


Modified:
    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=49172&r1=49171&r2=49172&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Thu Apr  3 12:29:44 2008
@@ -8090,7 +8090,7 @@
         {
           t = build_stmt (CATCH_EXPR, NULL_TREE, compound);
           cur_try_context->current_catch = t;
-          t = objc_build_exc_ptr ();
+          t = build1(NOP_EXPR, ptr_type_node, objc_build_exc_ptr ());
           t = build_function_call (objc2_begin_catch_decl,
                                    tree_cons (NULL_TREE, t, NULL_TREE));
           add_stmt (t);
@@ -8160,6 +8160,7 @@
     {     
       /* Decl an external declaration for the objc class for this catch type. */
       objc2_build_extern_decl_catch_object (type);
+      t = build1(NOP_EXPR, ptr_type_node, t);
       t = build_function_call (objc2_begin_catch_decl,
                                tree_cons (NULL_TREE, t, NULL_TREE));
     }