v8::TryCatch now works correctly with ASAN's UseAfterReturn mode enabled.

src/isolate.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #include "v8.h"
 
 #include "ast.h"
 #include "bootstrapper.h"
@@ skipping 254 matching lines @@
 #endif  // DEBUG
 
 
 void Isolate::RegisterTryCatchHandler(v8::TryCatch* that) {
   // The ARM simulator has a separate JS stack.  We therefore register
   // the C++ try catch handler with the simulator and get back an
   // address that can be used for comparisons with addresses into the
   // JS stack.  When running without the simulator, the address
   // returned will be the address of the C++ try catch handler itself.
   Address address = reinterpret_cast<Address>(
-      SimulatorStack::RegisterCTryCatch(reinterpret_cast<uintptr_t>(that)));
+      SimulatorStack::RegisterCTryCatch(reinterpret_cast<uintptr_t>(
+          that->DesanitizedThis())));
   thread_local_top()->set_try_catch_handler_address(address);
 }
 
 
 void Isolate::UnregisterTryCatchHandler(v8::TryCatch* that) {
-  ASSERT(thread_local_top()->TryCatchHandler() == that);
+  ASSERT(thread_local_top()->TryCatchHandler() == that->DesanitizedThis());
   thread_local_top()->set_try_catch_handler_address(
       reinterpret_cast<Address>(that->next_));
   thread_local_top()->catcher_ = NULL;
   SimulatorStack::UnregisterCTryCatch();
 }
 
 
 Handle<String> Isolate::StackTraceString() {
   if (stack_trace_nesting_level_ == 0) {
     stack_trace_nesting_level_++;
@@ skipping 1961 matching lines @@
   ASSERT(handle_scope_implementer()->CallDepthIsZero());
 
   // Increase call depth to prevent recursive callbacks.
   handle_scope_implementer()->IncrementCallDepth();
   Execution::RunMicrotasks(this);
   handle_scope_implementer()->DecrementCallDepth();
 }
 
 
 } }  // namespace v8::internal