Changeset 35584

Timestamp:

08/05/08 17:39:06 (4 months ago)

Author:

cwzwarich@webkit.org

Message:

2008-08-05 Cameron Zwarich <cwzwarich@uwaterloo.ca>

Reviewed by Darin.

Bug 20293: Crash in JavaScript codegen for eval("const a;")
<https://bugs.webkit.org/show_bug.cgi?id=20293>

Correctly handle constant declarations in eval code with no initializer.

JavaScriptCore:

• kjs/nodes.cpp: (KJS::ConstDeclNode::emitCodeSingle):

LayoutTests:

• fast/js/const-expected.txt:
• fast/js/resources/const.js:

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/const-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/resources/const.js (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-05  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Darin.
+
+        Bug 20293: Crash in JavaScript codegen for eval("const a;")
+        <https://bugs.webkit.org/show_bug.cgi?id=20293>
+
+        Correctly handle constant declarations in eval code with no initializer.
+
+        * kjs/nodes.cpp:
+        (KJS::ConstDeclNode::emitCodeSingle):
+
 2008-08-05  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1016 +1016 @@
     // assign to the wrong base if m_ident exists in an intervening dynamic scope.
     RefPtr<RegisterID> base = generator.emitResolveBase(generator.newTemporary(), m_ident);
-    RegisterID* value = generator.emitNode(m_init.get());
+    RegisterID* value = m_init ? generator.emitNode(m_init.get()) : generator.emitLoad(generator.newTemporary(), jsUndefined());
     return generator.emitPutById(base.get(), m_ident, value);
 }

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-08-05  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Darin.
+
+        Test for bug 20293: Crash in JavaScript codegen for eval("const a;")
+        <https://bugs.webkit.org/show_bug.cgi?id=20293>
+
+        * fast/js/const-expected.txt:
+        * fast/js/resources/const.js:
+
 2008-08-05  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/LayoutTests/fast/js/const-expected.txt

@@ -48 +48 @@
 PASS (function(){ one = 2; return one; })() is 1
 PASS f() is f
+PASS const a; is undefined
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/js/resources/const.js

@@ -108 +108 @@
 shouldBe("f()", "f");
 
+shouldBe("const a;", "undefined");
+
 var successfullyParsed = true;