Changeset 60527 in webkit

Timestamp:

Jun 1, 2010 7:38:44 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-01 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

Fix broken code generation in GenerateParametersCheckExpression.
​https://bugs.webkit.org/show_bug.cgi?id=39960

• bindings/scripts/CodeGeneratorJS.pm:
• bindings/scripts/test/JS/JSTestObj.cpp: Updated baseline.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-01  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Fix broken code generation in GenerateParametersCheckExpression.
+        https://bugs.webkit.org/show_bug.cgi?id=39960
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * bindings/scripts/test/JS/JSTestObj.cpp: Updated baseline.
+
 2010-06-01  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1116 +1116 @@
         # be converted to a string via .toString).
         push(@andExpression, "(${value}.isNull() || ${value}.isUndefined() || ${value}.isString() || ${value}.isObject())") if $codeGenerator->IsStringType($type);
-        push(@andExpression, "(${value}.isNull() || asObject(${value})->inherits(JS${type}::s_info)") unless IsNativeType($type);
+        push(@andExpression, "(${value}.isNull() || asObject(${value})->inherits(&JS${type}::s_info))") unless IsNativeType($type);
 
         $parameterIndex++;

trunk/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -886 +886 @@
 JSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(ExecState* exec)
 {
-    if ((exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(JSTestObj::s_info) && (exec->argument(1).isNull() || exec->argument(1).isUndefined() || exec->argument(1).isString() || exec->argument(1).isObject())))
+    if ((exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(&JSTestObj::s_info)) && (exec->argument(1).isNull() || exec->argument(1).isUndefined() || exec->argument(1).isString() || exec->argument(1).isObject())))
         return jsTestObjPrototypeFunctionOverloadedMethod1(exec);
-    if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(JSTestObj::s_info)) || (exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(JSTestObj::s_info)))
+    if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(&JSTestObj::s_info))) || (exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(&JSTestObj::s_info))))
         return jsTestObjPrototypeFunctionOverloadedMethod2(exec);
     if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || exec->argument(0).isUndefined() || exec->argument(0).isString() || exec->argument(0).isObject())))