Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (231539 => 231540)
--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-05-09 05:01:09 UTC (rev 231539)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-05-09 05:01:12 UTC (rev 231540)
@@ -1,5 +1,23 @@
2018-05-08 Jason Marcell <[email protected]>
+ Cherry-pick r231332. rdar://problem/40050814
+
+ Unreviewed, fix 32-bit profile offset for change in bytecode
+ length of the get_by_id and get_array_length opcodes.
+
+ * llint/LowLevelInterpreter32_64.asm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231332 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-05-03 Keith Miller <[email protected]>
+
+ Unreviewed, fix 32-bit profile offset for change in bytecode
+ length of the get_by_id and get_array_length opcodes.
+
+ * llint/LowLevelInterpreter32_64.asm:
+
+2018-05-08 Jason Marcell <[email protected]>
+
Cherry-pick r230980. rdar://problem/40050820
fromCharCode is missing some exception checks
Modified: branches/safari-605-branch/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (231539 => 231540)
--- branches/safari-605-branch/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2018-05-09 05:01:09 UTC (rev 231539)
+++ branches/safari-605-branch/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2018-05-09 05:01:12 UTC (rev 231540)
@@ -1382,7 +1382,7 @@
loadi 4[PC], t2
storei t0, TagOffset[cfr, t2, 8]
storei t1, PayloadOffset[cfr, t2, 8]
- valueProfile(t0, t1, 32, t2)
+ valueProfile(t0, t1, 28, t2)
dispatch(constexpr op_get_by_id_length)
.opGetByIdSlow:
@@ -1440,7 +1440,7 @@
loadp JSObject::m_butterfly[t3], t0
loadi -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0], t0
bilt t0, 0, .opGetArrayLengthSlow
- valueProfile(Int32Tag, t0, 32, t2)
+ valueProfile(Int32Tag, t0, 28, t2)
storep t0, PayloadOffset[cfr, t1, 8]
storep Int32Tag, TagOffset[cfr, t1, 8]
dispatch(constexpr op_get_array_length_length)
