Bug 1965844 - Part 4: Correctly update search index for resized typed array in lastIndexOf. r=jandem

marco-c · marco-c · commit e6a7652fa88a · 2025-05-14T13:37:27.000Z
Test case in <tc39/test262#4477>. Differential Revision: https://phabricator.services.mozilla.com/D248929 UltraBlame original commit: a7c3286c781fa3d67f2b75540b9be2c476e523a0
diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp
@@ -12964,32 +12964,50 @@ return
 false
 ;
 }
-len
+if
+(
+fromIndex
+>
+=
+0
+)
+{
+k
 =
+size_t
+(
 std
 :
 :
 min
 (
+fromIndex
+double
+(
 len
-tarray
 -
->
-length
-(
+1
 )
-.
-valueOr
-(
-0
 )
 )
 ;
-if
+}
+else
+{
+double
+d
+=
+double
 (
 len
-=
-=
+)
++
+fromIndex
+;
+if
+(
+d
+<
 0
 )
 {
@@ -13009,50 +13027,48 @@ return
 true
 ;
 }
-if
-(
-fromIndex
->
-=
-0
-)
-{
 k
 =
 size_t
 (
-std
-:
-:
-min
-(
-fromIndex
-double
+d
+)
+;
+}
+MOZ_ASSERT
 (
+k
+<
 len
--
-1
-)
-)
 )
 ;
-}
-else
-{
-double
-d
+size_t
+currentLength
 =
-double
+tarray
+-
+>
+length
 (
-len
 )
-+
-fromIndex
+.
+valueOr
+(
+0
+)
 ;
 if
 (
-d
+currentLength
 <
+len
+)
+{
+if
+(
+currentLength
+=
+=
 0
 )
 {
@@ -13074,11 +13090,21 @@ true
 }
 k
 =
-size_t
+std
+:
+:
+min
 (
-d
+k
+currentLength
+-
+1
 )
 ;
+len
+=
+currentLength
+;
 }
 }
 MOZ_ASSERT

Original file line number	Diff line number	Diff line change
`@@ -12964,32 +12964,50 @@ return`
`12964`	`12964`	`false`
`12965`	`12965`	`;`
`12966`	`12966`	`}`
`12967`		`-len`
	`12967`	`+if`
	`12968`	`+(`
	`12969`	`+fromIndex`
	`12970`	`+>`
	`12971`	`+=`
	`12972`	`+0`
	`12973`	`+)`
	`12974`	`+{`
	`12975`	`+k`
`12968`	`12976`	`=`
	`12977`	`+size_t`
	`12978`	`+(`
`12969`	`12979`	`std`
`12970`	`12980`	`:`
`12971`	`12981`	`:`
`12972`	`12982`	`min`
`12973`	`12983`	`(`
	`12984`	`+fromIndex`
	`12985`	`+double`
	`12986`	`+(`
`12974`	`12987`	`len`
`12975`		`-tarray`
`12976`	`12988`	`-`
`12977`		`->`
`12978`		`-length`
`12979`		`-(`
	`12989`	`+1`
`12980`	`12990`	`)`
`12981`		`-.`
`12982`		`-valueOr`
`12983`		`-(`
`12984`		`-0`
`12985`	`12991`	`)`
`12986`	`12992`	`)`
`12987`	`12993`	`;`
`12988`		`-if`
	`12994`	`+}`
	`12995`	`+else`
	`12996`	`+{`
	`12997`	`+double`
	`12998`	`+d`
	`12999`	`+=`
	`13000`	`+double`
`12989`	`13001`	`(`
`12990`	`13002`	`len`
`12991`		`-=`
`12992`		`-=`
	`13003`	`+)`
	`13004`	`++`
	`13005`	`+fromIndex`
	`13006`	`+;`
	`13007`	`+if`
	`13008`	`+(`
	`13009`	`+d`
	`13010`	`+<`
`12993`	`13011`	`0`
`12994`	`13012`	`)`
`12995`	`13013`	`{`
`@@ -13009,50 +13027,48 @@ return`
`13009`	`13027`	`true`
`13010`	`13028`	`;`
`13011`	`13029`	`}`
`13012`		`-if`
`13013`		`-(`
`13014`		`-fromIndex`
`13015`		`->`
`13016`		`-=`
`13017`		`-0`
`13018`		`-)`
`13019`		`-{`
`13020`	`13030`	`k`
`13021`	`13031`	`=`
`13022`	`13032`	`size_t`
`13023`	`13033`	`(`
`13024`		`-std`
`13025`		`-:`
`13026`		`-:`
`13027`		`-min`
`13028`		`-(`
`13029`		`-fromIndex`
`13030`		`-double`
	`13034`	`+d`
	`13035`	`+)`
	`13036`	`+;`
	`13037`	`+}`
	`13038`	`+MOZ_ASSERT`
`13031`	`13039`	`(`
	`13040`	`+k`
	`13041`	`+<`
`13032`	`13042`	`len`
`13033`		`--`
`13034`		`-1`
`13035`		`-)`
`13036`		`-)`
`13037`	`13043`	`)`
`13038`	`13044`	`;`
`13039`		`-}`
`13040`		`-else`
`13041`		`-{`
`13042`		`-double`
`13043`		`-d`
	`13045`	`+size_t`
	`13046`	`+currentLength`
`13044`	`13047`	`=`
`13045`		`-double`
	`13048`	`+tarray`
	`13049`	`+-`
	`13050`	`+>`
	`13051`	`+length`
`13046`	`13052`	`(`
`13047`		`-len`
`13048`	`13053`	`)`
`13049`		`-+`
`13050`		`-fromIndex`
	`13054`	`+.`
	`13055`	`+valueOr`
	`13056`	`+(`
	`13057`	`+0`
	`13058`	`+)`
`13051`	`13059`	`;`
`13052`	`13060`	`if`
`13053`	`13061`	`(`
`13054`		`-d`
	`13062`	`+currentLength`
`13055`	`13063`	`<`
	`13064`	`+len`
	`13065`	`+)`
	`13066`	`+{`
	`13067`	`+if`
	`13068`	`+(`
	`13069`	`+currentLength`
	`13070`	`+=`
	`13071`	`+=`
`13056`	`13072`	`0`
`13057`	`13073`	`)`
`13058`	`13074`	`{`
`@@ -13074,11 +13090,21 @@ true`
`13074`	`13090`	`}`
`13075`	`13091`	`k`
`13076`	`13092`	`=`
`13077`		`-size_t`
	`13093`	`+std`
	`13094`	`+:`
	`13095`	`+:`
	`13096`	`+min`
`13078`	`13097`	`(`
`13079`		`-d`
	`13098`	`+k`
	`13099`	`+currentLength`
	`13100`	`+-`
	`13101`	`+1`
`13080`	`13102`	`)`
`13081`	`13103`	`;`
	`13104`	`+len`
	`13105`	`+=`
	`13106`	`+currentLength`
	`13107`	`+;`
`13082`	`13108`	`}`
`13083`	`13109`	`}`
`13084`	`13110`	`MOZ_ASSERT`