IDL: Drop value conversion (V8 -> C++) macros from generated code

Source/bindings/tests/results/core/V8TestInterface.cpp

Index: Source/bindings/tests/results/core/V8TestInterface.cpp
diff --git a/Source/bindings/tests/results/core/V8TestInterface.cpp b/Source/bindings/tests/results/core/V8TestInterface.cpp
index 86ea6020f08b58c6175043732e42a8add7a0c506..a467adcdaa7e9d614b699204ca386fc0483e5ae4 100644
--- a/Source/bindings/tests/results/core/V8TestInterface.cpp
+++ b/Source/bindings/tests/results/core/V8TestInterface.cpp
@@ -109,7 +109,7 @@ static void doubleAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "doubleAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(double, cppValue, toRestrictedDouble(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(double, cppValue, convertAndThrow(cppValue = toRestrictedDouble(v8Value, exceptionState), exceptionState), return);
     impl->setDoubleAttribute(cppValue);
 }
 
@@ -139,7 +139,7 @@ static void floatAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "floatAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(float, cppValue, toRestrictedFloat(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(float, cppValue, convertAndThrow(cppValue = toRestrictedFloat(v8Value, exceptionState), exceptionState), return);
     impl->setFloatAttribute(cppValue);
 }
 
@@ -169,7 +169,7 @@ static void unrestrictedDoubleAttributeAttributeSetter(v8::Local<v8::Value> v8Va
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "unrestrictedDoubleAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(double, cppValue, toDouble(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(double, cppValue, convertAndThrow(cppValue = toDouble(v8Value, exceptionState), exceptionState), return);
     impl->setUnrestrictedDoubleAttribute(cppValue);
 }
 
@@ -199,7 +199,7 @@ static void unrestrictedFloatAttributeAttributeSetter(v8::Local<v8::Value> v8Val
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "unrestrictedFloatAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(float, cppValue, toFloat(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(float, cppValue, convertAndThrow(cppValue = toFloat(v8Value, exceptionState), exceptionState), return);
     impl->setUnrestrictedFloatAttribute(cppValue);
 }
 
@@ -228,7 +228,7 @@ static void testEnumAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const
 {
     v8::Local<v8::Object> holder = info.Holder();
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     String string = cppValue;
     if (!(string == "" || string == "EnumValue1" || string == "EnumValue2" || string == "EnumValue3"))
         return;
@@ -262,9 +262,8 @@ static void stringOrDoubleAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
 {
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "stringOrDoubleAttribute", "TestInterface", holder, info.GetIsolate());
-    StringOrDouble cppValue;
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE_ARGINTERNAL(V8StringOrDouble::toImpl(info.GetIsolate(), v8Value, cppValue, exceptionState), exceptionState);
+    TONATIVE_DECLARE(StringOrDouble, cppValue, V8StringOrDouble::toImpl(info.GetIsolate(), v8Value, cppValue, exceptionState), return exceptionState.throwException());
     impl->setStringOrDoubleAttribute(cppValue);
 }
 
@@ -289,7 +288,7 @@ static void staticStringAttributeAttributeGetterCallback(v8::Local<v8::String>,
 
 static void staticStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
 {
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     TestInterfaceImplementation::setStaticStringAttribute(cppValue);
 }
 
@@ -319,7 +318,7 @@ static void alwaysExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "alwaysExposedAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     impl->setAlwaysExposedAttribute(cppValue);
 }
 
@@ -349,7 +348,7 @@ static void workerExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "workerExposedAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     impl->setWorkerExposedAttribute(cppValue);
 }
 
@@ -379,7 +378,7 @@ static void windowExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "windowExposedAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     impl->setWindowExposedAttribute(cppValue);
 }
 
@@ -451,7 +450,7 @@ static void implementsStaticStringAttributeAttributeGetterCallback(v8::Local<v8:
 
 static void implementsStaticStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
 {
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     TestInterfaceImplementation::setImplementsStaticStringAttribute(cppValue);
 }
 
@@ -494,7 +493,7 @@ static void implementsStringAttributeAttributeSetter(v8::Local<v8::Value> v8Valu
 {
     v8::Local<v8::Object> holder = info.Holder();
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     impl->setImplementsStringAttribute(cppValue);
 }
 
@@ -654,7 +653,7 @@ static void implements2StaticStringAttributeAttributeGetterCallback(v8::Local<v8
 
 static void implements2StaticStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
 {
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     TestImplements2::setImplements2StaticStringAttribute(cppValue);
 }
 
@@ -683,7 +682,7 @@ static void implements2StringAttributeAttributeSetter(v8::Local<v8::Value> v8Val
 {
     v8::Local<v8::Object> holder = info.Holder();
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     TestImplements2::setImplements2StringAttribute(*impl, cppValue);
 }
 
@@ -712,7 +711,7 @@ static void implements3StringAttributeAttributeSetter(v8::Local<v8::Value> v8Val
 {
     v8::Local<v8::Object> holder = info.Holder();
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     TestImplements3Implementation::setImplements3StringAttribute(*impl, cppValue);
 }
 
@@ -737,7 +736,7 @@ static void implements3StaticStringAttributeAttributeGetterCallback(v8::Local<v8
 
 static void implements3StaticStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
 {
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     TestImplements3Implementation::setImplements3StaticStringAttribute(cppValue);
 }
 
@@ -772,7 +771,7 @@ static void partialLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, co
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "partialLongAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     TestPartialInterface::setPartialLongAttribute(*impl, cppValue);
 }
 #endif // ENABLE(PARTIAL_CONDITION)
@@ -806,7 +805,7 @@ static void partialStaticLongAttributeAttributeGetterCallback(v8::Local<v8::Stri
 static void partialStaticLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
 {
     ExceptionState exceptionState(ExceptionState::SetterContext, "partialStaticLongAttribute", "TestInterface", holder, info.GetIsolate());
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     TestPartialInterface::setPartialStaticLongAttribute(cppValue);
 }
 #endif // ENABLE(PARTIAL_CONDITION)
@@ -845,7 +844,7 @@ static void partialCallWithExecutionContextLongAttributeAttributeSetter(v8::Loca
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "partialCallWithExecutionContextLongAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
     TestPartialInterface::setPartialCallWithExecutionContextLongAttribute(executionContext, *impl, cppValue);
 }
@@ -883,7 +882,7 @@ static void partialPartialEnumTypeAttributeAttributeSetter(v8::Local<v8::Value>
 {
     v8::Local<v8::Object> holder = info.Holder();
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     String string = cppValue;
     if (!(string == "foo" || string == "bar"))
         return;
@@ -926,7 +925,7 @@ static void stringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v
 {
     v8::Local<v8::Object> holder = info.Holder();
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
     V8TestInterface::PrivateScript::stringAttributeAttributeSetter(toLocalFrame(toFrameIfNotDetached(info.GetIsolate()->GetCurrentContext())), impl, cppValue);
 }
 #endif // ENABLE(PARTIAL_CONDITION)
@@ -959,7 +958,7 @@ static void partial2LongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, c
     v8::Local<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "partial2LongAttribute", "TestInterface", holder, info.GetIsolate());
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     TestPartialInterfaceImplementation::setPartial2LongAttribute(*impl, cppValue);
 }
 
@@ -985,7 +984,7 @@ static void partial2StaticLongAttributeAttributeGetterCallback(v8::Local<v8::Str
 static void partial2StaticLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
 {
     ExceptionState exceptionState(ExceptionState::SetterContext, "partial2StaticLongAttribute", "TestInterface", holder, info.GetIsolate());
-    TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
     TestPartialInterfaceImplementation::setPartial2StaticLongAttribute(cppValue);
 }
 
@@ -1054,8 +1053,8 @@ static void voidMethodDoubleArgFloatArgMethod(const v8::FunctionCallbackInfo<v8:
     double doubleArg;
     float floatArg;
     {
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(doubleArg, toRestrictedDouble(info[0], exceptionState), exceptionState);
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(floatArg, toRestrictedFloat(info[1], exceptionState), exceptionState);
+        TONATIVE_CONVERT(convertAndThrow(doubleArg = toRestrictedDouble(info[0], exceptionState), exceptionState), return);
+        TONATIVE_CONVERT(convertAndThrow(floatArg = toRestrictedFloat(info[1], exceptionState), exceptionState), return);
     }
     impl->voidMethodDoubleArgFloatArg(doubleArg, floatArg);
 }
@@ -1079,8 +1078,8 @@ static void voidMethodUnrestrictedDoubleArgUnrestrictedFloatArgMethod(const v8::
     double unrestrictedDoubleArg;
     float unrestrictedFloatArg;
     {
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(unrestrictedDoubleArg, toDouble(info[0], exceptionState), exceptionState);
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(unrestrictedFloatArg, toFloat(info[1], exceptionState), exceptionState);
+        TONATIVE_CONVERT(convertAndThrow(unrestrictedDoubleArg = toDouble(info[0], exceptionState), exceptionState), return);
+        TONATIVE_CONVERT(convertAndThrow(unrestrictedFloatArg = toFloat(info[1], exceptionState), exceptionState), return);
     }
     impl->voidMethodUnrestrictedDoubleArgUnrestrictedFloatArg(unrestrictedDoubleArg, unrestrictedFloatArg);
 }
@@ -1101,7 +1100,7 @@ static void voidMethodTestEnumArgMethod(const v8::FunctionCallbackInfo<v8::Value
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     V8StringResource<> testEnumArg;
     {
-        TOSTRING_VOID_INTERNAL(testEnumArg, info[0]);
+        TONATIVE_CONVERT((testEnumArg = info[0]).prepare(), return);
         String string = testEnumArg;
         if (!(string == "" || string == "EnumValue1" || string == "EnumValue2" || string == "EnumValue3")) {
             V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodTestEnumArg", "TestInterface", "parameter 1 ('" + string + "') is not a valid enum value."));
@@ -1238,7 +1237,7 @@ static void overloadMethodWithExposedAndRuntimeEnabledFlag1Method(const v8::Func
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     int longArg;
     {
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(longArg, toInt32(info[0], exceptionState), exceptionState);
+        TONATIVE_CONVERT(convertAndThrow(longArg = toInt32(info[0], exceptionState), exceptionState), return);
     }
     impl->overloadMethodWithExposedAndRuntimeEnabledFlag(longArg);
 }
@@ -1248,7 +1247,7 @@ static void overloadMethodWithExposedAndRuntimeEnabledFlag2Method(const v8::Func
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     V8StringResource<> string;
     {
-        TOSTRING_VOID_INTERNAL(string, info[0]);
+        TONATIVE_CONVERT((string = info[0]).prepare(), return);
     }
     impl->overloadMethodWithExposedAndRuntimeEnabledFlag(string);
 }
@@ -1303,6 +1302,7 @@ static void overloadMethodWithExposedAndRuntimeEnabledFlagMethod(const v8::Funct
     }
     exceptionState.throwTypeError("No function was found that matched the signature provided.");
     exceptionState.throwIfNeeded();
+    return;
 }
 
 static void overloadMethodWithExposedAndRuntimeEnabledFlagMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -1350,7 +1350,7 @@ static void voidMethodPartialOverload2Method(const v8::FunctionCallbackInfo<v8::
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     double doubleArg;
     {
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(doubleArg, toRestrictedDouble(info[0], exceptionState), exceptionState);
+        TONATIVE_CONVERT(convertAndThrow(doubleArg = toRestrictedDouble(info[0], exceptionState), exceptionState), return);
     }
     impl->voidMethodPartialOverload(doubleArg);
 }
@@ -1410,7 +1410,7 @@ static void implementsComplexMethodMethod(const v8::FunctionCallbackInfo<v8::Val
     V8StringResource<> strArg;
     TestInterfaceEmpty* testInterfaceEmptyArg;
     {
-        TOSTRING_VOID_INTERNAL(strArg, info[0]);
+        TONATIVE_CONVERT((strArg = info[0]).prepare(), return);
         testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[1]);
         if (!testInterfaceEmptyArg) {
             exceptionState.throwTypeError("parameter 2 is not of type 'TestInterfaceEmpty'.");
@@ -1536,7 +1536,7 @@ static void partialVoidMethodLongArgMethod(const v8::FunctionCallbackInfo<v8::Va
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     int longArg;
     {
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(longArg, toInt32(info[0], exceptionState), exceptionState);
+        TONATIVE_CONVERT(convertAndThrow(longArg = toInt32(info[0], exceptionState), exceptionState), return);
     }
     TestPartialInterface::partialVoidMethodLongArg(*impl, longArg);
 }
@@ -1615,7 +1615,7 @@ static void shortMethodWithShortArgumentImplementedInPrivateScriptMethod(const v
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     int value;
     {
-        TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(value, toInt16(info[0], exceptionState), exceptionState);
+        TONATIVE_CONVERT(convertAndThrow(value = toInt16(info[0], exceptionState), exceptionState), return);
     }
     int result = 0;
     if (!V8TestInterface::PrivateScript::shortMethodWithShortArgumentImplementedInPrivateScriptMethod(toLocalFrame(toFrameIfNotDetached(info.GetIsolate()->GetCurrentContext())), impl, value, &result))
@@ -1852,7 +1852,7 @@ static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCall
 static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
-    TOSTRING_VOID(V8StringResource<>, propertyValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, propertyValue, (propertyValue = v8Value).prepare(), return);
     bool result = impl->anonymousIndexedSetter(index, propertyValue);
     if (!result)
         return;
@@ -1918,7 +1918,7 @@ static void namedPropertySetter(v8::Local<v8::Name> name, v8::Local<v8::Value> v
 
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     TOSTRING_VOID(V8StringResource<>, propertyName, nameString);
-    TOSTRING_VOID(V8StringResource<>, propertyValue, v8Value);
+    TONATIVE_DECLARE(V8StringResource<>, propertyValue, (propertyValue = v8Value).prepare(), return);
     bool result = impl->anonymousNamedSetter(propertyName, propertyValue);
     if (!result)
         return;
@@ -2355,7 +2355,7 @@ bool V8TestInterface::PrivateScript::shortMethodWithShortArgumentImplementedInPr
     v8::Local<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, scriptStateInUserScript, "TestInterfaceImplementation", "shortMethodWithShortArgumentImplementedInPrivateScript", holder, 1, argv);
     if (v8Value.IsEmpty())
         return false;
-    TONATIVE_DEFAULT_EXCEPTIONSTATE(int, cppValue, toInt16(v8Value, exceptionState), exceptionState, false);
+    TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt16(v8Value, exceptionState), exceptionState), return false);
     *result = cppValue;
     RELEASE_ASSERT(!exceptionState.hadException());
     return true;
@@ -2382,7 +2382,7 @@ bool V8TestInterface::PrivateScript::stringAttributeAttributeGetter(LocalFrame*
     v8::Local<v8::Value> v8Value = PrivateScriptRunner::runDOMAttributeGetter(scriptState, scriptStateInUserScript, "TestInterfaceImplementation", "stringAttribute", holder);
     if (v8Value.IsEmpty())
         return false;
-    TOSTRING_DEFAULT(V8StringResource<>, cppValue, v8Value, false);
+    TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return false);
     RELEASE_ASSERT(!exceptionState.hadException());
     *result = cppValue;
     return true;