Changes in directory llvm-poolalloc/lib/DSA:
Local.cpp updated: 1.158.2.4.2.8 -> 1.158.2.4.2.9 --- Log message: Reversed the order of metapools when merging. This ensures that the object on which we call the merge() method is never NULL. --- Diffs of the changes: (+1 -1) Local.cpp | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: llvm-poolalloc/lib/DSA/Local.cpp diff -u llvm-poolalloc/lib/DSA/Local.cpp:1.158.2.4.2.8 llvm-poolalloc/lib/DSA/Local.cpp:1.158.2.4.2.9 --- llvm-poolalloc/lib/DSA/Local.cpp:1.158.2.4.2.8 Tue Mar 13 20:24:01 2007 +++ llvm-poolalloc/lib/DSA/Local.cpp Mon Apr 9 15:20:07 2007 @@ -1466,7 +1466,7 @@ if (L.getPool() != N.getPool()) { std::cerr << "kmem_cache_alloc recovered merge\n"; MetaPoolHandle L(locs[V]), N(DSH.getNode()->getMP()); - locs[V]->merge(DSH.getNode()->getMP()); + DSH.getNode()->getMP()->merge(locs[V]); } locs[V] = DSH.getNode()->getMP(); } _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits