Changeset 34500 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Jun 11, 2008, 5:33:48 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-11 Cameron Zwarich <​[email protected]>

Reviewed by Maciej.

Bug 19498: REGRESSION (r34497): crash while loading GMail
<​https://bugs.webkit.org/show_bug.cgi?id=19498>

JavaScriptCore:

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitJumpIfTrueOptimized): (KJS::CodeGenerator::emitJumpIfTrue):
• VM/CodeGenerator.h:
• kjs/nodes.cpp: (KJS::DoWhileNode::emitCode): (KJS::WhileNode::emitCode): (KJS::ForNode::emitCode): (KJS::CaseBlockNode::emitCodeForBlock):

LayoutTests:

• fast/js/logical-or-jless-expected.txt: Added.
• fast/js/logical-or-jless.html: Added.
• fast/js/resources/logical-or-jless.js: Added.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (2 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -415 +415 @@
 }
 
-PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
+PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrueMayCombine(RegisterID* cond, LabelID* target)
 {
     if (m_lastOpcodeID == op_less) {
@@ -434 +434 @@
     }
     
+    return emitJumpIfTrue(cond, target);
+}
+
+PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
+{
     emitOpcode(op_jtrue);
     instructions().append(cond->index());