Rearrange the init sequence of PrimRefs and PrimTypeWithRefs. #5139
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gzm0
requested changes
Mar 14, 2025
gzm0
requested changes
Mar 14, 2025
2afe56d to
d6f6725
Compare
|
There seem to also be these mima problems: Also, the stability check fails. Did we rely on equals from the case class? |
gzm0
requested changes
Mar 15, 2025
|
FTR this was the stability diff: $ diff -u test-suite/target/test-suite-stability.js test-suite/js/.2.12/target/scala-2.12/scalajs-test-suite-test-fastopt/main.js
--- test-suite/target/test-suite-stability.js 2025-03-15 08:54:16.533595600 +0100
+++ test-suite/js/.2.12/target/scala-2.12/scalajs-test-suite-test-fastopt/main.js 2025-03-15 08:54:33.831557800 +0100
@@ -402525,9 +402525,9 @@
$c_scm_ArrayOps$ofBoolean.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofBoolean__f_repr;
});
-$c_scm_ArrayOps$ofBoolean.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofBoolean.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofBoolean__f_repr;
- return $n(this$).get(index);
+ return $n(this$).get(idx);
});
$c_scm_ArrayOps$ofBoolean.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {
@@ -402758,9 +402758,9 @@
$c_scm_ArrayOps$ofByte.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofByte__f_repr;
});
-$c_scm_ArrayOps$ofByte.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofByte.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofByte__f_repr;
- return $n(this$).get(index);
+ return $n(this$).get(idx);
});
$c_scm_ArrayOps$ofByte.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {
@@ -403224,9 +403224,9 @@
$c_scm_ArrayOps$ofDouble.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofDouble__f_repr;
});
-$c_scm_ArrayOps$ofDouble.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofDouble.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofDouble__f_repr;
- return $n(this$).get(index);
+ return $n(this$).get(idx);
});
$c_scm_ArrayOps$ofDouble.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {
@@ -403457,9 +403457,9 @@
$c_scm_ArrayOps$ofFloat.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofFloat__f_repr;
});
-$c_scm_ArrayOps$ofFloat.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofFloat.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofFloat__f_repr;
- return $n(this$).get(index);
+ return $n(this$).get(idx);
});
$c_scm_ArrayOps$ofFloat.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {
@@ -403690,9 +403690,9 @@
$c_scm_ArrayOps$ofInt.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofInt__f_repr;
});
-$c_scm_ArrayOps$ofInt.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofInt.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofInt__f_repr;
- return $n(this$).get(index);
+ return $n(this$).get(idx);
});
$c_scm_ArrayOps$ofInt.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {
@@ -403926,9 +403926,9 @@
$c_scm_ArrayOps$ofLong.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofLong__f_repr;
});
-$c_scm_ArrayOps$ofLong.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofLong.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofLong__f_repr;
- return $n(this$).get(index);
+ return $n(this$).get(idx);
});
$c_scm_ArrayOps$ofLong.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {
@@ -404629,9 +404629,9 @@
$c_scm_ArrayOps$ofUnit.prototype.repr__O = (function() {
return this.scm_ArrayOps$ofUnit__f_repr;
});
-$c_scm_ArrayOps$ofUnit.prototype.apply__I__ = (function(index) {
+$c_scm_ArrayOps$ofUnit.prototype.apply__I__ = (function(idx) {
var this$ = this.scm_ArrayOps$ofUnit__f_repr;
- $n(this$).get(index);
+ $n(this$).get(idx);
});
$c_scm_ArrayOps$ofUnit.prototype.clone__ = (function() {
if ($is_jl_Cloneable(this)) {So it looks to be confined into reflective proxies. It seems they don't have a stable way to choose the parameter names. Giving a stable hash code to Edit, more info: in the IR of def apply;I;B(index: int): byte = {
mod:scala.collection.mutable.ArrayOps$ofByte$.apply$extension;[B;I;B(this.repr;[B(), index)
}
def apply;I;Ljava.lang.Object(idx: int): any = {
mod:scala.collection.mutable.ArrayOps$ofByte$.apply$extension;[B;I;B(this.repr;[B(), idx)
}The second one is a bridge. Normally we use a "more specific" test to deterministical
8000
ly choose an overload for the reflective proxy target. Here there is a primitive, and our specificity test does not consider either more specific than the other (this is probably wrong?). So it falls back to the "pick any" criteria of the spec: I guess our "choose arbitrarily" is also "non-deterministically" (unless TypeRefs and therefore MethodNames have stable hash codes)
|
d6f6725 to
5ab874d
Compare
gzm0
approved these changes
Mar 15, 2025
So that it is more obvious that it is not circular. `PrimRef` is not a case class anymore.
5ab874d to
b1eabac
Compare
|
Squashed. |
gzm0
approved these changes
Mar 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So that it is more obvious that it is not circular.
The second commit is meant to address the comments that were originally reported in #5136.