summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/compiler/scala/tools/nsc/transform/Erasure.scala2
-rw-r--r--src/reflect/scala/reflect/api/Symbols.scala8
-rw-r--r--src/reflect/scala/reflect/internal/Symbols.scala4
-rw-r--r--test/files/pos/t8367.scala11
-rw-r--r--test/files/run/t6392b.check2
-rw-r--r--test/files/run/t7582-private-within.check2
-rw-r--r--test/files/run/t8192.check12
-rw-r--r--test/files/run/t8192/Macros_1.scala3
-rw-r--r--test/files/run/t8192/Test_2.scala3
9 files changed, 28 insertions, 19 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index bd2f6f0018..e036035397 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -600,7 +600,7 @@ abstract class Erasure extends AddInterfaces
if (tree.symbol == NoSymbol) {
tree
} else if (name == nme.CONSTRUCTOR) {
- if (tree.symbol.owner == AnyValClass) tree.symbol = ObjectClass.info.decl(nme.CONSTRUCTOR)
+ if (tree.symbol.owner == AnyValClass) tree.symbol = ObjectClass.primaryConstructor
tree
} else if (tree.symbol == Any_asInstanceOf)
adaptMember(atPos(tree.pos)(Select(qual, Object_asInstanceOf)))
diff --git a/src/reflect/scala/reflect/api/Symbols.scala b/src/reflect/scala/reflect/api/Symbols.scala
index a5a50f1088..dddd3c0e61 100644
--- a/src/reflect/scala/reflect/api/Symbols.scala
+++ b/src/reflect/scala/reflect/api/Symbols.scala
@@ -919,6 +919,14 @@ trait Symbols { self: Universe =>
* For a Scala package class, NoSymbol.
* For a Java class, NoSymbol.
*
+ * Known issues: Due to SI-8367, primaryConstructor may return unexpected results
+ * when called for Java classes (for some vague definition of a "Java class", which apparently
+ * not only includes javac-produced classfiles, but also consists of classes defined in
+ * Scala programs under the java.lang package). What's even worse, for some Java classes
+ * we can't even guarantee stability of the return value - depending on your classloader configuration
+ * and/or JDK version you might get different primaryConstructor for the same ClassSymbol.
+ * We have logged these issues at SI-8193.
+ *
* @group Class
*/
// TODO: SI-8193 I think we should only return a non-empty symbol if called for Scala classes
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index 03d8f97831..595d638c28 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -1904,6 +1904,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
/** The next enclosing method. */
def enclMethod: Symbol = if (isSourceMethod) this else owner.enclMethod
+ /** The primary constructor of a class. */
def primaryConstructor: Symbol = NoSymbol
/** The self symbol (a TermSymbol) of a class with explicit self type, or else the
@@ -3188,8 +3189,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
override def primaryConstructor = {
val c = info decl primaryConstructorName
- if (isJavaDefined) NoSymbol // need to force info before checking the flag
- else if (c.isOverloaded) c.alternatives.head else c
+ if (c.isOverloaded) c.alternatives.head else c
}
override def associatedFile = (
diff --git a/test/files/pos/t8367.scala b/test/files/pos/t8367.scala
new file mode 100644
index 0000000000..cae2415405
--- /dev/null
+++ b/test/files/pos/t8367.scala
@@ -0,0 +1,11 @@
+package java.lang
+
+// SI-8367 shows something is wrong with primaryConstructor and it was made worse with the fix for SI-8192
+// perhaps primaryConstructor should not return NoSymbol when isJavaDefined
+// or, perhaps isJavaDefined should be refined (the package definition above is pretty sneaky)
+// also, why does this only happen for a (scala-defined!) class with this special name?
+// (there are a couple of others: CloneNotSupportedException,InterruptedException)
+class Throwable
+
+// class CloneNotSupportedException
+// class InterruptedException \ No newline at end of file
diff --git a/test/files/run/t6392b.check b/test/files/run/t6392b.check
index 83d8fe20c1..9bb9b5694f 100644
--- a/test/files/run/t6392b.check
+++ b/test/files/run/t6392b.check
@@ -1 +1 @@
-ModuleDef(Modifiers(), TermName("C")#MOD, Template(List(Select(Ident(scala#PK), TypeName("AnyRef")#TPE)), noSelfType, List(DefDef(Modifiers(), termNames.CONSTRUCTOR#PCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(TypeName("C")), typeNames.EMPTY), termNames.CONSTRUCTOR#CTOR), List())), Literal(Constant(())))))))
+ModuleDef(Modifiers(), TermName("C")#MOD, Template(List(Select(Ident(scala#PK), TypeName("AnyRef")#TPE)), noSelfType, List(DefDef(Modifiers(), termNames.CONSTRUCTOR#PCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(TypeName("C")), typeNames.EMPTY), termNames.CONSTRUCTOR#PCTOR), List())), Literal(Constant(())))))))
diff --git a/test/files/run/t7582-private-within.check b/test/files/run/t7582-private-within.check
index 1b9a0910af..b2743ffa06 100644
--- a/test/files/run/t7582-private-within.check
+++ b/test/files/run/t7582-private-within.check
@@ -2,7 +2,7 @@ private[package pack] class JavaPackagePrivate
private[package pack] module JavaPackagePrivate
private[package pack] module class JavaPackagePrivate
private[package pack] field field
-private[package pack] constructor <init>
+private[package pack] primary constructor <init>
private[package pack] method meth
private[package pack] field staticField
private[package pack] method staticMeth
diff --git a/test/files/run/t8192.check b/test/files/run/t8192.check
index 7195703e19..2423a7acbf 100644
--- a/test/files/run/t8192.check
+++ b/test/files/run/t8192.check
@@ -1,10 +1,4 @@
compile-time
-class File
-primary constructor: NoSymbol
-def <init>(x$1: String): java.io.File => false
-def <init>(x$1: String,x$2: String): java.io.File => false
-def <init>(x$1: java.io.File,x$2: String): java.io.File => false
-def <init>(x$1: java.net.URI): java.io.File => false
package scala
primary constructor: NoSymbol
object List
@@ -21,12 +15,6 @@ primary constructor: def <init>(x: Int): C => true
def <init>(x: Int): C => true
def <init>(x: String): C => false
runtime
-class File
-primary constructor: NoSymbol
-def <init>(x$1: java.io.File,x$2: java.lang.String): java.io.File => false
-def <init>(x$1: java.lang.String): java.io.File => false
-def <init>(x$1: java.lang.String,x$2: java.lang.String): java.io.File => false
-def <init>(x$1: java.net.URI): java.io.File => false
package scala
primary constructor: NoSymbol
object List
diff --git a/test/files/run/t8192/Macros_1.scala b/test/files/run/t8192/Macros_1.scala
index ddad9fb872..72fb2cf313 100644
--- a/test/files/run/t8192/Macros_1.scala
+++ b/test/files/run/t8192/Macros_1.scala
@@ -30,7 +30,8 @@ object Macros {
}
println("compile-time")
- test(typeOf[File].typeSymbol.asClass)
+ // SI-8367 primaryConstructor for Java-defined classes is unstable, so I'm commenting this out
+ // test(typeOf[File].typeSymbol.asClass)
test(definitions.ScalaPackageClass)
test(definitions.ListModule.moduleClass.asClass)
test(typeOf[Product1[_]].typeSymbol.asClass)
diff --git a/test/files/run/t8192/Test_2.scala b/test/files/run/t8192/Test_2.scala
index 29f187c171..89302083ad 100644
--- a/test/files/run/t8192/Test_2.scala
+++ b/test/files/run/t8192/Test_2.scala
@@ -30,7 +30,8 @@ object Test extends App {
Macros.foo
println("runtime")
- test(typeOf[File].typeSymbol.asClass)
+ // SI-8367 primaryConstructor for Java-defined classes is unstable, so I'm commenting this out
+ // test(typeOf[File].typeSymbol.asClass)
test(definitions.ScalaPackageClass)
test(definitions.ListModule.moduleClass.asClass)
test(typeOf[Product1[_]].typeSymbol.asClass)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 15:58:31 +0000