[llvm-commits] [llvm] r69693 - /llvm/tags/Apple/llvmCore-2105.2/lib/ExecutionEngine/JIT/JIT.cpp

[Bill Wendling]

Author: void
Date: Tue Apr 21 13:29:45 2009
New Revision: 69693

URL: http://llvm.org/viewvc/llvm-project?rev=69693&view=rev
Log:
--- Merging r69314 into '.':
U    lib/ExecutionEngine/JIT/JIT.cpp

Merge in this fix into llvmCore-2105.2.

Modified:
    llvm/tags/Apple/llvmCore-2105.2/lib/ExecutionEngine/JIT/JIT.cpp

Modified: llvm/tags/Apple/llvmCore-2105.2/lib/ExecutionEngine/JIT/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2105.2/lib/ExecutionEngine/JIT/JIT.cpp?rev=69693&r1=69692&r2=69693&view=diff

==============================================================================
--- llvm/tags/Apple/llvmCore-2105.2/lib/ExecutionEngine/JIT/JIT.cpp (original)
+++ llvm/tags/Apple/llvmCore-2105.2/lib/ExecutionEngine/JIT/JIT.cpp Tue Apr 21 13:29:45 2009
@@ -231,11 +231,9 @@
   // The key is created on demand, and libgcc creates it the first time an
   // exception occurs. Since we need the key to register frames, we create
   // it now.
-  if (!LOI) {
-    LOI = (LibgccObjectInfo*)malloc(sizeof(struct LibgccObjectInfo)); 
-    _keymgr_set_and_unlock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST,
-                                           LOI);
-  }
+  if (!LOI)
+    LOI = (LibgccObjectInfo*)calloc(sizeof(struct LibgccObjectInfo), 1); 
+  _keymgr_set_and_unlock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST, LOI);
   InstallExceptionTableRegister(DarwinRegisterFrame);
 #else
   InstallExceptionTableRegister(__register_frame);