From e822c99eaab2a31ef97b3c1bf555efdf52100777 Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Wed, 11 Nov 2009 05:30:02 +0000 Subject: Fix JITTest.ModuleDeletion in -Asserts mode (which turns off JITEmitDebugInfo by default). llvm-svn: 86807 --- llvm/unittests/ExecutionEngine/JIT/JITTest.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'llvm/unittests/ExecutionEngine/JIT/JITTest.cpp') diff --git a/llvm/unittests/ExecutionEngine/JIT/JITTest.cpp b/llvm/unittests/ExecutionEngine/JIT/JITTest.cpp index 19765d4e60e..5b8d299f58f 100644 --- a/llvm/unittests/ExecutionEngine/JIT/JITTest.cpp +++ b/llvm/unittests/ExecutionEngine/JIT/JITTest.cpp @@ -434,10 +434,16 @@ TEST_F(JITTest, ModuleDeletion) { RJMM->deallocateFunctionBodyCalls.size()); SmallPtrSet ExceptionTablesDeallocated; + unsigned NumTablesDeallocated = 0; for (unsigned i = 0, e = RJMM->deallocateExceptionTableCalls.size(); i != e; ++i) { ExceptionTablesDeallocated.insert( RJMM->deallocateExceptionTableCalls[i].ET); + if (RJMM->deallocateExceptionTableCalls[i].ET != NULL) { + // If JITEmitDebugInfo is off, we'll "deallocate" NULL, which doesn't + // appear in startExceptionTableCalls. + NumTablesDeallocated++; + } } for (unsigned i = 0, e = RJMM->startExceptionTableCalls.size(); i != e; ++i) { EXPECT_TRUE(ExceptionTablesDeallocated.count( @@ -446,7 +452,7 @@ TEST_F(JITTest, ModuleDeletion) { << RJMM->startExceptionTableCalls[i].F_dump; } EXPECT_EQ(RJMM->startExceptionTableCalls.size(), - RJMM->deallocateExceptionTableCalls.size()); + NumTablesDeallocated); } // This code is copied from JITEventListenerTest, but it only runs once for all -- cgit v1.2.3