Use auto-rethrowing v8::TryCatch variant

Source/bindings/v8/V8BindingMacros.h

Index: Source/bindings/v8/V8BindingMacros.h
diff --git a/Source/bindings/v8/V8BindingMacros.h b/Source/bindings/v8/V8BindingMacros.h
index ac4fa714f71defb4f72aff8f4672cd33a1e93dc9..efc446ab611ae2b4fbf9853e65092a6cb38e7865 100644
--- a/Source/bindings/v8/V8BindingMacros.h
+++ b/Source/bindings/v8/V8BindingMacros.h
@@ -47,17 +47,19 @@ namespace WebCore {
     }
 
 #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) \
@@ -106,15 +108,7 @@ namespace WebCore {
 
 #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) \