Use auto-rethrowing v8::TryCatch variant

Source/bindings/v8/V8BindingMacros.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #define TONATIVE_EXCEPTION(type, var, value) \
     type var;                                \
     {                                        \
         v8::TryCatch block;                  \
         var = (value);                       \
         if (UNLIKELY(block.HasCaught()))     \
             return block.ReThrow();          \
     }
 
 #define TONATIVE_VOID_INTERNAL(var, value) \
-    var = (value);                        \
-    if (UNLIKELY(block.HasCaught())) {    \
-        block.ReThrow();                  \
-        return;                           \
-    }
+    var = (value);                         \
+    if (UNLIKELY(block.HasCaught()))       \
+        return;
 
 #define TONATIVE_VOID(type, var, value)    \
     type var;                              \
     {                                      \
         v8::TryCatch block;                \

[yhirano, 2014/05/30 09:33:21]

You can use V8RethrowTryCatchScope and reuse TONATIVE_VOID_INTERNAL.

[Jens Widell, 2014/05/30 09:46:39]

Done.

-        TONATIVE_VOID_INTERNAL(var, value); \
+        var = (value);                     \
+        if (UNLIKELY(block.HasCaught())) { \
+            block.ReThrow();               \
+            return;                        \
+        }                                  \
     }
 
 #define TONATIVE_DEFAULT(type, var, value, retVal) \
     type var;                                      \
     {                                              \
         v8::TryCatch block;                        \
         var = (value);                             \
         if (UNLIKELY(block.HasCaught())) {         \
             block.ReThrow();                       \
             return retVal;                         \
@@ skipping 28 matching lines @@
 // type is an instance of class template V8StringResource<>,
 // but Mode argument varies; using type (not Mode) for consistency
 // with other macros and ease of code generation
 #define TOSTRING_VOID(type, var, value) \
     type var(value);                    \
     if (UNLIKELY(!var.prepare()))       \
         return;
 
 #define TOSTRING_VOID_INTERNAL(var, value) \
     var = (value);                         \
-    if (UNLIKELY(!var.prepare())) {        \
-        block.ReThrow();                   \
-        return;                            \
-    }
-
-// There are no v8::TryCatch declared outside.
-#define TOSTRING_VOID_INTERNAL_NOTRYCATCH(var, value) \
-    var = (value);                                    \
-    if (UNLIKELY(!var.prepare()))                     \
+    if (UNLIKELY(!var.prepare()))          \
         return;
 
 #define TOSTRING_DEFAULT(type, var, value, retVal) \
     type var(value);                               \
     if (UNLIKELY(!var.prepare()))                  \
         return retVal;
 
 } // namespace WebCore
 
 #endif // V8BindingMacros_h