Skip to content

Commit

Permalink
Backport "Fix undercompilation upon ctor change" to LTS (#20994)
Browse files Browse the repository at this point in the history
Backports #19911 to the LTS branch.

PR submitted by the release tooling.
[skip ci]
  • Loading branch information
WojciechMazur authored Jul 4, 2024
2 parents e449b68 + 49e7b4c commit e48cbe7
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 8 deletions.
20 changes: 13 additions & 7 deletions compiler/src/dotty/tools/dotc/sbt/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.Symbols.Symbol
import dotty.tools.dotc.core.NameOps.stripModuleClassSuffix
import dotty.tools.dotc.core.Names.Name
import dotty.tools.dotc.core.Names.termName

inline val TermNameHash = 1987 // 300th prime
inline val TypeNameHash = 1993 // 301st prime
inline val InlineParamHash = 1997 // 302nd prime

extension (sym: Symbol)

def constructorName(using Context) =
sym.owner.fullName ++ ";init;"

/** Mangle a JVM symbol name in a format better suited for internal uses by sbt. */
def zincMangledName(using Context): Name =
if (sym.isConstructor) constructorName
else sym.name.stripModuleClassSuffix
/** Mangle a JVM symbol name in a format better suited for internal uses by sbt.
* WARNING: output must not be written to TASTy, as it is not a valid TASTy name.
*/
private[sbt] def zincMangledName(using Context): Name =
if sym.isConstructor then
// TODO: ideally we should avoid unnecessarily caching these Zinc specific
// names in the global chars array. But we would need to restructure
// ExtractDependencies caches to avoid expensive `toString` on
// each member reference.
termName(sym.owner.fullName.mangledString.replace(".", ";").nn ++ ";init;")
else
sym.name.stripModuleClassSuffix
2 changes: 1 addition & 1 deletion sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ class ExtractUsedNamesSpecification {
// All classes extend Object
"Object",
// All classes have a default constructor called <init>
"java.lang.Object;init;",
"java;lang;Object;init;",
// the return type of the default constructor is Unit
"Unit"
)
Expand Down
2 changes: 2 additions & 0 deletions sbt-test/source-dependencies/constructors/A.scala
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
package example

class A(a: Int)
2 changes: 2 additions & 0 deletions sbt-test/source-dependencies/constructors/B.scala
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
package example

class B { val y = new A(2) }
2 changes: 2 additions & 0 deletions sbt-test/source-dependencies/constructors/changes/A2.scala
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
package example

class A(a: String)
2 changes: 2 additions & 0 deletions sbt-test/source-dependencies/constructors/changes/B2.scala
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
package example

class B { val y = new A("a") }

0 comments on commit e48cbe7

Please sign in to comment.