Skip to content

Commit bc08290

Browse files
committed
Don't generate *: in generic Java signatures
1 parent 2d1427d commit bc08290

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package transform
44

55
import core.Annotations.Annotation
66
import core.Contexts.Context
7+
import core.Definitions
78
import core.Flags._
89
import core.Names.Name
910
import core.Symbols._
@@ -191,6 +192,8 @@ object GenericSignatures {
191192
args.foreach(jsig(_))
192193
}
193194
}
195+
else if (sym == defn.PairClass && tp.tupleArity > Definitions.MaxTupleArity)
196+
jsig(defn.TupleXXLType)
194197
else if (isTypeParameterInSig(sym, sym0)) {
195198
assert(!sym.isAliasType, "Unexpected alias type: " + sym)
196199
typeParamSig(sym.name.lastPart)

compiler/src/dotty/tools/dotc/typer/Inliner.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ object Inliner {
132132
tree,
133133
i"""|Maximal number of successive inlines (${ctx.settings.XmaxInlines.value}) exceeded,
134134
|Maybe this is caused by a recursive rewrite method?
135-
|You can use -Xmax:inlines to change the limit.""",
135+
|You can use -Xmax-inlines to change the limit.""",
136136
(tree :: enclosingInlineds).last.pos
137137
)
138138
}

0 commit comments

Comments
 (0)