Skip to content

Commit cf22092

Browse files
committed
Bug 1829637: Make sure a jit hints map is allocated in the runtime before accessing it. r=iain
Differential Revision: https://phabricator.services.mozilla.com/D176432 UltraBlame original commit: 07f0aa2b869d5bcb38011341004d2a51e217c260
1 parent 48ad09e commit cf22092

File tree

3 files changed

+36
-10
lines changed

3 files changed

+36
-10
lines changed

js/src/jit/BaselineCodeGen.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,6 +1482,24 @@ if
14821482
JitOptions
14831483
.
14841484
disableJitHints
1485+
&
1486+
&
1487+
cx
1488+
-
1489+
>
1490+
runtime
1491+
(
1492+
)
1493+
-
1494+
>
1495+
jitRuntime
1496+
(
1497+
)
1498+
-
1499+
>
1500+
hasJitHintsMap
1501+
(
1502+
)
14851503
)
14861504
{
14871505
JitHintsMap

js/src/jit/BaselineJIT.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,6 +2056,24 @@ script
20562056
noEagerBaselineHint
20572057
(
20582058
)
2059+
&
2060+
&
2061+
cx
2062+
-
2063+
>
2064+
runtime
2065+
(
2066+
)
2067+
-
2068+
>
2069+
jitRuntime
2070+
(
2071+
)
2072+
-
2073+
>
2074+
hasJitHintsMap
2075+
(
2076+
)
20592077
)
20602078
{
20612079
JitHintsMap

js/src/jit/Ion.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -817,9 +817,6 @@ ref
817817
)
818818
)
819819
;
820-
#
821-
ifdef
822-
NIGHTLY_BUILD
823820
js_delete
824821
(
825822
jitHintsMap_
@@ -829,8 +826,6 @@ ref
829826
)
830827
)
831828
;
832-
#
833-
endif
834829
}
835830
uint32_t
836831
JitRuntime
@@ -977,9 +972,6 @@ return
977972
false
978973
;
979974
}
980-
#
981-
ifdef
982-
NIGHTLY_BUILD
983975
if
984976
(
985977
!
@@ -1011,8 +1003,6 @@ false
10111003
;
10121004
}
10131005
}
1014-
#
1015-
endif
10161006
if
10171007
(
10181008
JitOptions

0 commit comments

Comments
 (0)