[llvm-branch-commits] [llvm-branch] r98622 - in /llvm/branches/Apple/Morbo: ./ lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp

[Bill Wendling]

Author: void
Date: Tue Mar 16 01:57:25 2010
New Revision: 98622

URL: http://llvm.org/viewvc/llvm-project?rev=98622&view=rev
Log:
$ svn merge -c 98612 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r98612 into '.':
U    lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp


Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 01:57:25 2010
@@ -1 +1 @@
-/llvm/trunk:98602,98604,98615-98616
+/llvm/trunk:98602,98604,98612,98615-98616

Modified: llvm/branches/Apple/Morbo/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp?rev=98622&r1=98621&r2=98622&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp Tue Mar 16 01:57:25 2010
@@ -165,7 +165,7 @@
 
 void JITDebugRegisterer::UnregisterFunctionInternal(
     RegisteredFunctionsMap::iterator I) {
-  jit_code_entry *JITCodeEntry = I->second.second;
+  jit_code_entry *&JITCodeEntry = I->second.second;
 
   // Acquire the lock and do the unregistration.
   {
@@ -190,6 +190,9 @@
     __jit_debug_register_code();
   }
 
+  delete JITCodeEntry;
+  JITCodeEntry = NULL;
+
   // Free the ELF file in memory.
   std::string &Buffer = I->second.first;
   Buffer.clear();