From: Chris Lattner <sabre@nondot.org>
Date: Sun, 13 Apr 2008 07:04:56 +0000 (+0000)
Subject: Fix some serious logic errors that broke the jit on darwin/x86-64.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3b374489041ac28153c84194dda45e182d8939fc;p=oota-llvm.git

Fix some serious logic errors that broke the jit on darwin/x86-64.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49606 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 2277897d3e4..64d3cd78405 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -370,17 +370,17 @@ static void AddFunctionToSymbolTable(const char *FnName,
   // If we have space in the table, reallocate the table.
   if (SymTabPtr->NumSymbols >= SymTabPtr->NumAllocated) {
     // If we don't have space, reallocate the table.
-    unsigned NewSize = std::min(64U, SymTabPtr->NumAllocated*2);
+    unsigned NewSize = std::max(64U, SymTabPtr->NumAllocated*2);
     JitSymbolEntry *NewSymbols = new JitSymbolEntry[NewSize];
     JitSymbolEntry *OldSymbols = SymTabPtr->Symbols;
     
     // Copy the old entries over.
     memcpy(NewSymbols, OldSymbols,
-           SymTabPtr->NumAllocated*sizeof(JitSymbolEntry));
+           SymTabPtr->NumSymbols*sizeof(OldSymbols[0]));
     
     // Swap the new symbols in, delete the old ones.
     SymTabPtr->Symbols = NewSymbols;
-    SymTabPtr->NumSymbols = NewSize;
+    SymTabPtr->NumAllocated = NewSize;
     delete [] OldSymbols;
   }