commit a43e0937c62719a405ce64888892facaead122df
author Elliott Hughes <enh@google.com> Tue Mar 27 18:35:33 2012 -0700
committer Elliott Hughes <enh@google.com> Tue Mar 27 18:35:33 2012 -0700
tree 8183b6dd0e71ae115317c7e192adc759ea1e1ab4
parent 6ff0536ba09248eecf9dbcc046c10533ba92a262

Disarm an assertion that exception_test violates.

Change-Id: I2e9079d254a9132ec1c66fe4856e0d4b881a7b5d

src/exception_test.cc

diff --git a/src/exception_test.cc b/src/exception_test.cc
index 877f1c3..3c2235a 100644
--- a/src/exception_test.cc
+++ b/src/exception_test.cc
@@ -184,6 +184,10 @@
   EXPECT_STREQ("ExceptionHandle.java", trace_array->Get(1)->GetFileName()->ToModifiedUtf8().c_str());
   EXPECT_STREQ("f", trace_array->Get(1)->GetMethodName()->ToModifiedUtf8().c_str());
   EXPECT_EQ(22, trace_array->Get(1)->GetLineNumber());
+
+#if !defined(ART_USE_LLVM_COMPILER)
+  thread->SetTopOfStack(NULL, 0); // Disarm the assertion that no code is running when we detach.
+#endif
 }
 
 }  // namespace art