From b8ab527949bdf21e00bbcd4173d58ebfa373b6ed Mon Sep 17 00:00:00 2001 From: Roy Tam Date: Fri, 10 Jan 2020 17:03:52 +0800 Subject: [PATCH] ported mozilla upstream bug: Bug 1607443 - Fix some alias sets. r=tcampbell, a=lizzard --- js/src/jit/AliasAnalysisShared.cpp | 4 ++-- js/src/jit/MIR.h | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/js/src/jit/AliasAnalysisShared.cpp b/js/src/jit/AliasAnalysisShared.cpp index 0f0d4a66a8..400626b336 100644 --- a/js/src/jit/AliasAnalysisShared.cpp +++ b/js/src/jit/AliasAnalysisShared.cpp @@ -86,8 +86,6 @@ GetObject(const MDefinition* ins) case MDefinition::Op_SetInitializedLength: case MDefinition::Op_ArrayLength: case MDefinition::Op_SetArrayLength: - case MDefinition::Op_StoreElementHole: - case MDefinition::Op_FallibleStoreElement: case MDefinition::Op_TypedObjectDescr: case MDefinition::Op_Slots: case MDefinition::Op_Elements: @@ -143,6 +141,8 @@ GetObject(const MDefinition* ins) case MDefinition::Op_WasmStoreGlobalVar: case MDefinition::Op_ArrayJoin: case MDefinition::Op_ArraySlice: + case MDefinition::Op_StoreElementHole: + case MDefinition::Op_FallibleStoreElement: return nullptr; default: #ifdef DEBUG diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index e7186ed305..0c1e77f802 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -9490,12 +9490,6 @@ class MStoreElementHole TRIVIAL_NEW_WRAPPERS NAMED_OPERANDS((0, object), (1, elements), (2, index), (3, value)) - AliasSet getAliasSet() const override { - // StoreElementHole can update the initialized length, the array length - // or reallocate obj->elements. - return AliasSet::Store(AliasSet::ObjectFields | AliasSet::Element); - } - ALLOW_CLONE(MStoreElementHole) }; @@ -9526,9 +9520,6 @@ class MFallibleStoreElement TRIVIAL_NEW_WRAPPERS NAMED_OPERANDS((0, object), (1, elements), (2, index), (3, value)) - AliasSet getAliasSet() const override { - return AliasSet::Store(AliasSet::ObjectFields | AliasSet::Element); - } bool strict() const { return strict_; }