summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-04-13 07:04:56 +0000
committerChris Lattner <sabre@nondot.org>2008-04-13 07:04:56 +0000
commit4d232bccca6ffbe21dfa503ace932d80cf19e422 (patch)
tree5e1357b15a623961c0f0094a69a8255d01be30fa /llvm/lib/ExecutionEngine
parenta07136ee2dc29579568e4f08c65db974855841dc (diff)
downloadbcm5719-llvm-4d232bccca6ffbe21dfa503ace932d80cf19e422.tar.gz
bcm5719-llvm-4d232bccca6ffbe21dfa503ace932d80cf19e422.zip
Fix some serious logic errors that broke the jit on darwin/x86-64.
llvm-svn: 49606
Diffstat (limited to 'llvm/lib/ExecutionEngine')
-rw-r--r--llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 2277897d3e4..64d3cd78405 100644
--- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud