Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/bindings/scripts/code_generator_v8.pm

Issue 121113004: Improve handling of failed integer type conversions. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update expected outputs Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/virtual/gpu/fast/canvas/webgl/gl-object-get-calls-expected.txt ('k') | Source/bindings/scripts/unstable/v8_types.py » ('j') | Source/bindings/tests/results/V8TestObject.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/scripts/code_generator_v8.pm
diff --git a/Source/bindings/scripts/code_generator_v8.pm b/Source/bindings/scripts/code_generator_v8.pm
index 5c4a4e4a5acc3176d3432509cec33691bb9ae698..e6f7c5a21dfa783c6f581ee6d1aac4c0e0189bb6 100644
--- a/Source/bindings/scripts/code_generator_v8.pm
+++ b/Source/bindings/scripts/code_generator_v8.pm
@@ -169,14 +169,17 @@ my %primitiveTypeHash = ("Date" => 1,
"double" => 1,
);
-my %integerTypeHash = ("byte" => 1,
- "octet" => 1,
- "short" => 1,
- "long" => 1,
- "long long" => 1,
- "unsigned short" => 1,
- "unsigned long" => 1,
- "unsigned long long" => 1,
+# NOTE: For the unsigned types, the "UI" prefix is used (and not
+# "Ui"), so as to match onto the naming of V8Binding conversion
+# methods (and not the Typed Array naming scheme for unsigned types.)
+my %integerTypeHash = ("byte" => "Int8",
+ "octet" => "UInt8",
+ "short" => "Int16",
+ "long" => "Int32",
+ "long long" => "Int64",
+ "unsigned short" => "UInt16",
+ "unsigned long" => "UInt32",
+ "unsigned long long" => "UInt64"
);
my %nonWrapperTypes = ("CompareHow" => 1,
@@ -1929,11 +1932,14 @@ sub GenerateNormalAttributeSetter
my $useExceptions = 1 if $raisesException && ($raisesException eq "VALUE_IS_MISSING" or $raisesException eq "Setter");
my $hasStrictTypeChecking = 1 if $attribute->extendedAttributes->{"StrictTypeChecking"} && IsWrapperType($attrType); # Currently only actually check interface types
+ # Can throw exceptions from accessors or during type conversion.
+ my $isNumberType = IsIntegerType($attribute->type);
+
# We throw exceptions using 'ExceptionState' if the attribute explicitly
# claims that exceptions may be raised, or if a strict type check might
# fail, or if we're dealing with SVG, which does strange things with
# tearoffs and read-only wrappers.
- if ($useExceptions or $hasStrictTypeChecking or GetSVGTypeNeedingTearOff($interfaceName) or GetSVGTypeNeedingTearOff($attrType)) {
+ if ($useExceptions or $hasStrictTypeChecking or GetSVGTypeNeedingTearOff($interfaceName) or GetSVGTypeNeedingTearOff($attrType) or $isNumberType) {
$code .= " ExceptionState exceptionState(ExceptionState::SetterContext, \"${attrName}\", \"${interfaceName}\", info.Holder(), info.GetIsolate());\n";
}
@@ -2360,18 +2366,23 @@ sub GenerateFunction
$code .= "static void ${name}Method${forMainWorldSuffix}(const v8::FunctionCallbackInfo<v8::Value>& info)\n";
$code .= "{\n";
- # We throw exceptions using 'ExceptionState' if the function explicitly claims that exceptions
- # may be raised, or for event listeners, or for security-checking, and for weird SVG stuff.
+ # We throw exceptions using 'ExceptionState' for a function if:
+ # - it explicitly claims that exceptions may be raised (or should be if type checks fail.)
+ # - event listeners
+ # - security-checking
+ # - weird SVG stuff.
jsbell 2014/01/02 18:03:23 nit: inconsistent punctuation in the list
+ # - takes a parameter that might raise an exception on conversion.
+ #
my $isEventListener = $name eq "addEventListener" || $name eq "removeEventListener";
my $isSecurityCheckNecessary = $interface->extendedAttributes->{"CheckSecurity"} && !$function->extendedAttributes->{"DoNotCheckSecurity"};
my $raisesExceptions = $function->extendedAttributes->{"RaisesException"};
+ my $hasStrictTypeChecking = $function->extendedAttributes->{"StrictTypeChecking"};
my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
my $isNonListSVGType = $svgNativeType && !($interfaceName =~ /List$/);
- my $hasExceptionState = 0;
- if ($raisesExceptions || $isEventListener || $isSecurityCheckNecessary || $isNonListSVGType || HasSerializedScriptValueParameter($function)) {
+ my $hasExceptionState = $raisesExceptions || $isEventListener || $isSecurityCheckNecessary || $isNonListSVGType || HasExceptionRaisingParameter($function);
+ if ($hasExceptionState) {
$code .= " ExceptionState exceptionState(ExceptionState::ExecutionContext, \"${unoverloadedName}\", \"${interfaceName}\", info.Holder(), info.GetIsolate());\n";
- $hasExceptionState = 1;
}
if ($isEventListener) {
@@ -2459,7 +2470,7 @@ END
$code .= $parameterCheckString;
# Build the function call string.
- $code .= GenerateFunctionCallString($function, $paramIndex, " ", $interface, $forMainWorldSuffix, %replacements);
+ $code .= GenerateFunctionCallString($function, $paramIndex, " ", $interface, $forMainWorldSuffix, $hasExceptionState, %replacements);
$code .= "}\n";
$code .= "#endif // ${conditionalString}\n" if $conditionalString;
$code .= "\n";
@@ -2567,7 +2578,7 @@ sub GenerateParametersCheck
$parameterCheckString .= <<END;
if (UNLIKELY(info.Length() <= $paramIndex)) {
END
- $parameterCheckString .= GenerateFunctionCallString($function, $paramIndex, " " x 2, $interface, $forMainWorldSuffix, %replacements);
+ $parameterCheckString .= GenerateFunctionCallString($function, $paramIndex, " " x 2, $interface, $forMainWorldSuffix, $hasExceptionState, %replacements);
$parameterCheckString .= <<END;
return;
}
@@ -2778,7 +2789,7 @@ sub GenerateSingleConstructorCallback
}
my $constructorRaisesException = $interface->extendedAttributes->{"RaisesException"} && $interface->extendedAttributes->{"RaisesException"} eq "Constructor";
- my $raisesExceptions = $function->extendedAttributes->{"RaisesException"} || $constructorRaisesException || HasSerializedScriptValueParameter($function);
+ my $hasExceptionState = $function->extendedAttributes->{"RaisesException"} || $constructorRaisesException || HasExceptionRaisingParameter($function);
my @beforeArgumentList;
my @afterArgumentList;
@@ -2788,17 +2799,15 @@ static void constructor${overloadedIndexString}(const v8::FunctionCallbackInfo<v
{
END
+ if ($hasExceptionState) {
+ $code .= " ExceptionState exceptionState(ExceptionState::ConstructionContext, \"${interfaceName}\", info.Holder(), info.GetIsolate());\n";
+ }
if ($function->overloadedIndex == 0) {
- my $hasExceptionState = 0;
$code .= GenerateArgumentsCountCheck($function, $interface, $hasExceptionState);
}
- if ($raisesExceptions) {
- $code .= " ExceptionState exceptionState(ExceptionState::ConstructionContext, \"${interfaceName}\", info.Holder(), info.GetIsolate());\n";
- }
-
# FIXME: Currently [Constructor(...)] does not yet support optional arguments without [Default=...]
- my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface, "", $raisesExceptions);
+ my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface, "", $hasExceptionState);
$code .= $parameterCheckString;
if ($interface->extendedAttributes->{"ConstructorCallWith"}) {
@@ -3072,7 +3081,7 @@ sub GenerateNamedConstructor
my $implClassName = GetImplName($interface);
my $v8ClassName = GetV8ClassName($interface);
my $constructorRaisesException = $interface->extendedAttributes->{"RaisesException"} && $interface->extendedAttributes->{"RaisesException"} eq "Constructor";
- my $raisesExceptions = $function->extendedAttributes->{"RaisesException"} || $constructorRaisesException || HasSerializedScriptValueParameter($function);
+ my $raisesExceptions = $function->extendedAttributes->{"RaisesException"} || $constructorRaisesException || HasExceptionRaisingParameter($function);
my $maybeObserveFeature = GenerateFeatureObservation($function->extendedAttributes->{"MeasureAs"});
my $maybeDeprecateFeature = GenerateDeprecationNotification($function->extendedAttributes->{"DeprecateAs"});
@@ -3113,14 +3122,13 @@ END
END
- if ($raisesExceptions) {
+ my $hasExceptionState = $raisesExceptions;
+ if ($hasExceptionState) {
$code .= " ExceptionState exceptionState(ExceptionState::ConstructionContext, \"${interfaceName}\", info.Holder(), info.GetIsolate());\n";
}
-
- my $hasExceptionState = $raisesExceptions;
$code .= GenerateArgumentsCountCheck($function, $interface, $hasExceptionState);
- my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface, "", $raisesExceptions);
+ my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface, "", $hasExceptionState);
$code .= $parameterCheckString;
push(@beforeArgumentList, "*document");
@@ -3707,23 +3715,28 @@ sub GenerateImplementationIndexedPropertySetter
my $implClassName = GetImplName($interface);
my $v8ClassName = GetV8ClassName($interface);
my $methodName = GetImplName($indexedSetterFunction);
+ my $interfaceName = $interface->name;
my $type = $indexedSetterFunction->parameters->[1]->type;
my $raisesExceptions = $indexedSetterFunction->extendedAttributes->{"RaisesException"};
my $treatNullAs = $indexedSetterFunction->parameters->[1]->extendedAttributes->{"TreatNullAs"};
my $treatUndefinedAs = $indexedSetterFunction->parameters->[1]->extendedAttributes->{"TreatUndefinedAs"};
- my $asSetterValue = 0;
my $code = "static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
$code .= "{\n";
- $code .= " ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
- $code .= JSValueToNativeStatement($indexedSetterFunction->parameters->[1]->type, $indexedSetterFunction->extendedAttributes, $asSetterValue, "jsValue", "propertyValue", " ", "info.GetIsolate()");
my $extraArguments = "";
- if ($raisesExceptions) {
+ if ($raisesExceptions || IsIntegerType($type)) {
$code .= " ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
- $extraArguments = ", exceptionState";
+ if ($raisesExceptions) {
+ $extraArguments = ", exceptionState";
+ }
}
+
+ my $asSetterValue = 0;
+ $code .= " ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+ $code .= JSValueToNativeStatement($indexedSetterFunction->parameters->[1]->type, $indexedSetterFunction->extendedAttributes, $asSetterValue, "jsValue", "propertyValue", " ", "info.GetIsolate()");
+
my @conditions = ();
my @statements = ();
if ($treatNullAs && $treatNullAs ne "NullString") {
@@ -4012,11 +4025,12 @@ sub GenerateImplementationNamedPropertySetter
my $implClassName = GetImplName($interface);
my $v8ClassName = GetV8ClassName($interface);
my $methodName = GetImplName($namedSetterFunction);
+ my $interfaceName = $interface->name;
+ my $type = $namedSetterFunction->parameters->[1]->type;
my $raisesExceptions = $namedSetterFunction->extendedAttributes->{"RaisesException"};
my $treatNullAs = $namedSetterFunction->parameters->[1]->extendedAttributes->{"TreatNullAs"};
my $treatUndefinedAs = $namedSetterFunction->parameters->[1]->extendedAttributes->{"TreatUndefinedAs"};
- my $asSetterValue = 0;
my $code = "static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
$code .= "{\n";
@@ -4028,15 +4042,20 @@ sub GenerateImplementationNamedPropertySetter
$code .= " if (info.Holder()->HasRealNamedProperty(name))\n";
$code .= " return;\n";
}
- $code .= " ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
- $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[0]->type, $namedSetterFunction->extendedAttributes, $asSetterValue, "name", "propertyName", " ", "info.GetIsolate()");
- $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[1]->type, $namedSetterFunction->extendedAttributes, $asSetterValue, "jsValue", "propertyValue", " ", "info.GetIsolate()");
+
my $extraArguments = "";
- if ($raisesExceptions) {
+ if ($raisesExceptions || IsIntegerType($type)) {
$code .= " ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
- $extraArguments = ", exceptionState";
+ if ($raisesExceptions) {
+ $extraArguments = ", exceptionState";
+ }
}
+ my $asSetterValue = 0;
+ $code .= " ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+ $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[0]->type, $namedSetterFunction->extendedAttributes, $asSetterValue, "name", "propertyName", " ", "info.GetIsolate()");
+ $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[1]->type, $namedSetterFunction->extendedAttributes, $asSetterValue, "jsValue", "propertyValue", " ", "info.GetIsolate()");
+
my @conditions = ();
my @statements = ();
if ($treatNullAs && $treatNullAs ne "NullString") {
@@ -5187,6 +5206,7 @@ sub GenerateFunctionCallString
my $indent = shift;
my $interface = shift;
my $forMainWorldSuffix = shift;
+ my $hasExceptionState = shift;
my %replacements = @_;
my $interfaceName = $interface->name;
@@ -5236,12 +5256,22 @@ sub GenerateFunctionCallString
push @arguments, $replacements{$paramName};
} elsif (IsSVGTypeNeedingTearOff($parameter->type) and not $interfaceName =~ /List$/) {
push @arguments, "$paramName->propertyReference()";
- $code .= <<END;
+ if ($hasExceptionState) {
+ $code .= <<END;
+ if (!$paramName) {
+ exceptionState.throwTypeError(\"parameter $humanFriendlyIndex is not of type '${ \$parameter->type }'.\");
+ exceptionState.throwIfNeeded();
+ return;
+ }
+END
+ } else {
+ $code .= <<END;
if (!$paramName) {
throwTypeError(ExceptionMessages::failedToExecute(\"$name\", \"$interfaceName\", \"parameter $humanFriendlyIndex is not of type '${ \$parameter->type }'.\"), info.GetIsolate());
return;
}
END
+ }
} elsif ($parameter->type eq "SVGMatrix" and $interfaceName eq "SVGTransformList") {
push @arguments, "$paramName.get()";
} elsif (IsNullableParameter($parameter)) {
@@ -5430,8 +5460,8 @@ sub JSValueToNativeStatement
} else {
$code .= $indent . "$nativeType $variableName($native_value, true);\n";
}
- } elsif ($extendedAttributes->{"EnforceRange"}) {
- $code .= $indent . "V8TRYCATCH_WITH_TYPECHECK_VOID($nativeType, $variableName, $native_value, $getIsolate);\n";
+ } elsif (IsIntegerType($type)) {
+ $code .= $indent . "V8TRYCATCH_EXCEPTION_VOID($nativeType, $variableName, $native_value, exceptionState);\n";
} else {
$code .= $indent . "V8TRYCATCH_VOID($nativeType, $variableName, $native_value);\n";
}
@@ -5448,29 +5478,16 @@ sub JSValueToNative
my $value = shift;
my $getIsolate = shift;
- my $intConversion = $extendedAttributes->{"EnforceRange"} ? "EnforceRange" : "NormalConversion";
-
return "$value->BooleanValue()" if $type eq "boolean";
return "static_cast<$type>($value->NumberValue())" if $type eq "float" or $type eq "double";
- if ($intConversion ne "NormalConversion") {
- return "toInt8($value, $intConversion, ok)" if $type eq "byte";
- return "toUInt8($value, $intConversion, ok)" if $type eq "octet";
- return "toInt16($value, $intConversion, ok)" if $type eq "short";
- return "toUInt16($value, $intConversion, ok)" if $type eq "unsigned short";
- return "toInt32($value, $intConversion, ok)" if $type eq "long";
- return "toUInt32($value, $intConversion, ok)" if $type eq "unsigned long";
- return "toInt64($value, $intConversion, ok)" if $type eq "long long";
- return "toUInt64($value, $intConversion, ok)" if $type eq "unsigned long long";
- } else {
- return "toInt8($value)" if $type eq "byte";
- return "toUInt8($value)" if $type eq "octet";
- return "toInt16($value)" if $type eq "short";
- return "toUInt16($value)" if $type eq "unsigned short";
- return "toInt32($value)" if $type eq "long";
- return "toUInt32($value)" if $type eq "unsigned long";
- return "toInt64($value)" if $type eq "long long";
- return "toUInt64($value)" if $type eq "unsigned long long";
+ if (IsIntegerType($type)) {
+ my $conversion = "to" . $integerTypeHash{$type} . "($value";
+ if ($extendedAttributes->{"EnforceRange"}) {
+ return "${conversion}, EnforceRange, exceptionState)";
+ } else {
+ return "${conversion}, exceptionState)";
+ }
}
return "static_cast<Range::CompareHow>($value->Int32Value())" if $type eq "CompareHow";
return "toWebCoreDate($value)" if $type eq "Date";
@@ -6376,13 +6393,15 @@ sub NeedsSpecialWrap
return 0;
}
-sub HasSerializedScriptValueParameter
+sub HasExceptionRaisingParameter
{
my $function = shift;
foreach my $parameter (@{$function->parameters}) {
if ($parameter->type eq "SerializedScriptValue") {
return 1;
+ } elsif (IsIntegerType($parameter->type)) {
+ return 1;
}
}
return 0;
« no previous file with comments | « LayoutTests/virtual/gpu/fast/canvas/webgl/gl-object-get-calls-expected.txt ('k') | Source/bindings/scripts/unstable/v8_types.py » ('j') | Source/bindings/tests/results/V8TestObject.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698