commit 14691c5e786e8c2c5734f687e4c96217340771be
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 05 10:40:17 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Mar 09 10:09:33 2015 +0000
tree 7c2156671b323c70ffdd1d48d5e2f1d1de79c5fc
parent 3d7d2af4c6502b771b032ee9bf3ab30e78f9c60d

Compute the right catch location for the debugger.

Also remove tls ThrowLocation, it is not needed anymore.

Change-Id: I78fddf09ce968ca475e39c17fa76d699c589c8d9

runtime/entrypoints/quick/quick_throw_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_throw_entrypoints.cc b/runtime/entrypoints/quick/quick_throw_entrypoints.cc
index 25df40b..127f9e0 100644
--- a/runtime/entrypoints/quick/quick_throw_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_throw_entrypoints.cc
@@ -41,12 +41,12 @@
    * exception_ in thread and delivering the exception.
    */
   ScopedQuickEntrypointChecks sqec(self);
-  ThrowLocation throw_location = self->GetCurrentLocationForThrow();
   if (exception == nullptr) {
+    ThrowLocation throw_location = self->GetCurrentLocationForThrow();
     self->ThrowNewException(throw_location, "Ljava/lang/NullPointerException;",
                             "throw with null exception");
   } else {
-    self->SetException(throw_location, exception);
+    self->SetException(exception);
   }
   self->QuickDeliverException();
 }