Skip to content

Commit 09e55fe

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 bc3f9f3 commit 09e55fe

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
@@ -1282,6 +1282,24 @@ if
12821282
JitOptions
12831283
.
12841284
disableJitHints
1285+
&
1286+
&
1287+
cx
1288+
-
1289+
>
1290+
runtime
1291+
(
1292+
)
1293+
-
1294+
>
1295+
jitRuntime
1296+
(
1297+
)
1298+
-
1299+
>
1300+
hasJitHintsMap
1301+
(
1302+
)
12851303
)
12861304
{
12871305
JitHintsMap

js/src/jit/BaselineJIT.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,24 @@ script
14831483
noEagerBaselineHint
14841484
(
14851485
)
1486+
&
1487+
&
1488+
cx
1489+
-
1490+
>
1491+
runtime
1492+
(
1493+
)
1494+
-
1495+
>
1496+
jitRuntime
1497+
(
1498+
)
1499+
-
1500+
>
1501+
hasJitHintsMap
1502+
(
1503+
)
14861504
)
14871505
{
14881506
JitHintsMap

js/src/jit/Ion.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,6 @@ ref
683683
)
684684
)
685685
;
686-
#
687-
ifdef
688-
NIGHTLY_BUILD
689686
js_delete
690687
(
691688
jitHintsMap_
@@ -695,8 +692,6 @@ ref
695692
)
696693
)
697694
;
698-
#
699-
endif
700695
}
701696
uint32_t
702697
JitRuntime
@@ -843,9 +838,6 @@ return
843838
false
844839
;
845840
}
846-
#
847-
ifdef
848-
NIGHTLY_BUILD
849841
if
850842
(
851843
!
@@ -877,8 +869,6 @@ false
877869
;
878870
}
879871
}
880-
#
881-
endif
882872
if
883873
(
884874
JitOptions

0 commit comments

Comments
 (0)