Changeset 49005 in webkit for trunk/JavaScriptCore/jit/JITOpcodes.cpp

Timestamp:

Oct 1, 2009, 4:49:28 PM (16 years ago)

Author:

[email protected]

Message:

Roll out r49004 since it broke the debug build.

File:

• trunk/JavaScriptCore/jit/JITOpcodes.cpp (modified) (5 diffs)

trunk/JavaScriptCore/jit/JITOpcodes.cpp

@@ -249 +249 @@
 
     // Check for an exception
+    // FIXME: Maybe we can optimize this comparison to JSValue().
     move(ImmPtr(&globalData->exception), regT2);
-    Jump sawException = branch32(NotEqual, tagFor(0, regT2), Imm32(JSValue::EmptyValueTag));
+    Jump sawException1 = branch32(NotEqual, tagFor(0, regT2), Imm32(JSValue::CellTag));
+    Jump sawException2 = branch32(NonZero, payloadFor(0, regT2), Imm32(0));
 
     // Grab the return address.
@@ -263 +265 @@
 
     // Handle an exception
-    sawException.link(this);
+    sawException1.link(this);
+    sawException2.link(this);
     // Grab the return address.
     emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
@@ -1235 +1238 @@
 
     Jump isInt32 = branch32(Equal, regT1, Imm32(JSValue::Int32Tag));
-    addSlowCase(branch32(AboveOrEqual, regT1, Imm32(JSValue::EmptyValueTag)));
+    addSlowCase(branch32(AboveOrEqual, regT1, Imm32(JSValue::DeletedValueTag)));
     isInt32.link(this);
 
@@ -1379 +1382 @@
 void JIT::emit_op_create_arguments(Instruction*)
 {
-    Jump argsCreated = branch32(NotEqual, tagFor(RegisterFile::ArgumentsRegister, callFrameRegister), Imm32(JSValue::EmptyValueTag));
+    Jump argsNotCell = branch32(NotEqual, tagFor(RegisterFile::ArgumentsRegister, callFrameRegister), Imm32(JSValue::CellTag));
+    Jump argsNotNull = branchTestPtr(NonZero, payloadFor(RegisterFile::ArgumentsRegister, callFrameRegister));
 
     // If we get here the arguments pointer is a null cell - i.e. arguments need lazy creation.
@@ -1387 +1391 @@
         JITStubCall(this, cti_op_create_arguments).call();
 
-    argsCreated.link(this);
+    argsNotCell.link(this);
+    argsNotNull.link(this);
 }