Title: [142789] trunk/Source/_javascript_Core
- Revision
- 142789
- Author
- [email protected]
- Date
- 2013-02-13 13:40:03 -0800 (Wed, 13 Feb 2013)
Log Message
Build fix.
Rearranged the code somewhat to reduce the number of
DFG related ifdefs.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (142788 => 142789)
--- trunk/Source/_javascript_Core/ChangeLog 2013-02-13 21:36:34 UTC (rev 142788)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-02-13 21:40:03 UTC (rev 142789)
@@ -1,3 +1,13 @@
+2013-02-13 Oliver Hunt <[email protected]>
+
+ Build fix.
+
+ Rearranged the code somewhat to reduce the number of
+ DFG related ifdefs.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+
2013-02-13 Filip Pizlo <[email protected]>
ForwardInt32ToDouble is not in DFG::MinifiedNode's list of relevant node types
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (142788 => 142789)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2013-02-13 21:36:34 UTC (rev 142788)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2013-02-13 21:40:03 UTC (rev 142789)
@@ -1872,12 +1872,20 @@
break;
}
#endif
+ case op_resolve_base:
case op_resolve_base_to_global:
case op_resolve_base_to_global_dynamic:
case op_resolve_base_to_scope:
case op_resolve_base_to_scope_with_top_scope_check: {
instructions[i + 4].u.resolveOperations = &m_resolveOperations[pc[i + 4].u.operand];
instructions[i + 5].u.putToBaseOperation = &m_putToBaseOperations[pc[i + 5].u.operand];
+#if ENABLE(DFG_JIT)
+ ValueProfile* profile = "" + opLength - 1].u.operand];
+ ASSERT(profile->m_bytecodeOffset == -1);
+ profile->m_bytecodeOffset = i;
+ ASSERT((opLength - 1) > 5);
+ instructions[i + opLength - 1] = profile;
+#endif
break;
}
case op_resolve_global_property:
@@ -1894,23 +1902,27 @@
break;
}
case op_resolve: {
+#if ENABLE(DFG_JIT)
ValueProfile* profile = "" + opLength - 1].u.operand];
ASSERT(profile->m_bytecodeOffset == -1);
profile->m_bytecodeOffset = i;
+ ASSERT((opLength - 1) > 3);
+#endif
instructions[i + 3].u.resolveOperations = &m_resolveOperations[pc[i + 3].u.operand];
instructions[i + opLength - 1] = profile;
break;
}
- case op_resolve_base:
case op_resolve_with_base:
case op_resolve_with_this: {
+ instructions[i + 4].u.resolveOperations = &m_resolveOperations[pc[i + 4].u.operand];
+ if (pc[i].u.opcode != op_resolve_with_this)
+ instructions[i + 5].u.putToBaseOperation = &m_putToBaseOperations[pc[i + 5].u.operand];
+#if ENABLE(DFG_JIT)
ValueProfile* profile = "" + opLength - 1].u.operand];
ASSERT(profile->m_bytecodeOffset == -1);
profile->m_bytecodeOffset = i;
- instructions[i + 4].u.resolveOperations = &m_resolveOperations[pc[i + 4].u.operand];
- if (pc[i].u.opcode != op_resolve_with_this)
- instructions[i + 5].u.putToBaseOperation = &m_putToBaseOperations[pc[i + 5].u.operand];
instructions[i + opLength - 1] = profile;
+#endif
break;
}
case op_new_object: {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
