commit 122146bf9953f0ae51a541a36c0ad5762d90f1ac
author Andrew Hsieh <andrewhsieh@google.com> Wed Jan 23 15:37:58 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 23 15:37:58 2013 +0000
tree a63d2e6b92485fcda638e6271077697158fe82cb
parent 8d88c5277e0e51cb4fa0a04f47e3455495366235
parent bfa632c0f1d1ccf590aef435c307c48b39446d8f

Merge "[gabi++] Fix bug: Use un-exsited object in uncaught_exception."

sources/cxx-stl/gabi++/src/terminate.cc

diff --git a/sources/cxx-stl/gabi++/src/terminate.cc b/sources/cxx-stl/gabi++/src/terminate.cc
index 576b18a..17435f9 100644
--- a/sources/cxx-stl/gabi++/src/terminate.cc
+++ b/sources/cxx-stl/gabi++/src/terminate.cc
@@ -157,11 +157,7 @@
   bool uncaught_exception() throw() {
     using namespace __cxxabiv1;
 
-    __cxa_eh_globals* globals = __cxa_get_globals_fast();
-    if (!globals) {
-      return false;
-    }
-
+    __cxa_eh_globals* globals = __cxa_get_globals();
     return globals->uncaughtExceptions != 0;
   }