Title: [117099] branches/safari-536-branch/Source/_javascript_Core
Diff
Modified: branches/safari-536-branch/Source/_javascript_Core/ChangeLog (117098 => 117099)
--- branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-05-15 18:07:39 UTC (rev 117098)
+++ branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-05-15 18:08:56 UTC (rev 117099)
@@ -1,5 +1,16 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116363
+
+ 2012-05-07 Oliver Hunt <[email protected]>
+
+ Fix release build.
+
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116361
2012-05-07 Oliver Hunt <[email protected]>
Modified: branches/safari-536-branch/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (117098 => 117099)
--- branches/safari-536-branch/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2012-05-15 18:07:39 UTC (rev 117098)
+++ branches/safari-536-branch/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2012-05-15 18:08:56 UTC (rev 117099)
@@ -1172,10 +1172,10 @@
LLINT_BEGIN();
JSValue scrutinee = LLINT_OP_C(3).jsValue();
ASSERT(scrutinee.isString());
- JSString* value = asString(scrutinee);
- ASSERT(value->length() == 1);
+ JSString* string = asString(scrutinee);
+ ASSERT(string->length() == 1);
int defaultOffset = pc[2].u.operand;
- StringImpl* impl = asString(scrutinee)->value(exec).impl();
+ StringImpl* impl = string->value(exec).impl();
CodeBlock* codeBlock = exec->codeBlock();
pc += codeBlock->characterSwitchJumpTable(pc[1].u.operand).offsetForValue((*impl)[0], defaultOffset);
LLINT_END();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
