Title: [241053] branches/safari-607-branch/Source/_javascript_Core
- Revision
- 241053
- Author
- alanc...@apple.com
- Date
- 2019-02-06 14:16:09 -0800 (Wed, 06 Feb 2019)
Log Message
Cherry-pick r240448. rdar://problem/47774335
Update ARM64EHash
https://bugs.webkit.org/show_bug.cgi?id=193776
<rdar://problem/47526457>
Reviewed by Mark Lam.
See radar for details.
* assembler/AssemblerBuffer.h:
(JSC::ARM64EHash::update):
(JSC::ARM64EHash::finalHash const):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/_javascript_Core/ChangeLog (241052 => 241053)
--- branches/safari-607-branch/Source/_javascript_Core/ChangeLog 2019-02-06 22:16:06 UTC (rev 241052)
+++ branches/safari-607-branch/Source/_javascript_Core/ChangeLog 2019-02-06 22:16:09 UTC (rev 241053)
@@ -1,3 +1,36 @@
+2019-02-05 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r240448. rdar://problem/47774335
+
+ Update ARM64EHash
+ https://bugs.webkit.org/show_bug.cgi?id=193776
+ <rdar://problem/47526457>
+
+ Reviewed by Mark Lam.
+
+ See radar for details.
+
+ * assembler/AssemblerBuffer.h:
+ (JSC::ARM64EHash::update):
+ (JSC::ARM64EHash::finalHash const):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-24 Saam Barati <sbar...@apple.com>
+
+ Update ARM64EHash
+ https://bugs.webkit.org/show_bug.cgi?id=193776
+ <rdar://problem/47526457>
+
+ Reviewed by Mark Lam.
+
+ See radar for details.
+
+ * assembler/AssemblerBuffer.h:
+ (JSC::ARM64EHash::update):
+ (JSC::ARM64EHash::finalHash const):
+
2019-02-06 Mark Lam <mark....@apple.com>
Cherry-pick r240998. rdar://problem/47843417
Modified: branches/safari-607-branch/Source/_javascript_Core/assembler/AssemblerBuffer.h (241052 => 241053)
--- branches/safari-607-branch/Source/_javascript_Core/assembler/AssemblerBuffer.h 2019-02-06 22:16:06 UTC (rev 241052)
+++ branches/safari-607-branch/Source/_javascript_Core/assembler/AssemblerBuffer.h 2019-02-06 22:16:09 UTC (rev 241053)
@@ -155,7 +155,7 @@
uint64_t input = value ^ m_hash;
uint64_t a = static_cast<uint32_t>(tagInt(input, static_cast<PtrTag>(0)) >> 39);
uint64_t b = tagInt(input, static_cast<PtrTag>(0xb7e151628aed2a6a)) >> 23;
- m_hash = a | b;
+ m_hash = a ^ b;
}
uint32_t finalHash() const
{
@@ -162,7 +162,7 @@
uint64_t hash = m_hash;
uint64_t a = static_cast<uint32_t>(tagInt(hash, static_cast<PtrTag>(0xbf7158809cf4f3c7)) >> 39);
uint64_t b = tagInt(hash, static_cast<PtrTag>(0x62e7160f38b4da56)) >> 23;
- return static_cast<uint32_t>(a | b);
+ return static_cast<uint32_t>(a ^ b);
}
private:
uint32_t m_hash { 0 };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
