Skip to content

Commit 1af3894

Browse files
authored
Merge pull request #3069 from dotty-staging/fix-noinline-bootstrap
Fix initialization vulnerability in Scanner
2 parents 8249cab + 865e8f0 commit 1af3894

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import collection.immutable.BitSet
66

77
object JavaTokens extends TokensCommon {
88
final val minToken = EMPTY
9-
final val maxToken = DOUBLE
9+
final def maxToken = DOUBLE
1010

1111
final val javaOnlyKeywords = tokenRange(INSTANCEOF, ASSERT)
1212
final val sharedKeywords = BitSet( IF, FOR, ELSE, THIS, NULL, NEW, SUPER, ABSTRACT, FINAL, PRIVATE, PROTECTED,

compiler/src/dotty/tools/dotc/parsing/Tokens.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import collection.immutable.BitSet
66
import core.Decorators._
77

88
abstract class TokensCommon {
9-
val maxToken: Int
9+
def maxToken: Int
1010

1111
type Token = Int
1212
type TokenSet = BitSet
@@ -145,7 +145,7 @@ abstract class TokensCommon {
145145

146146
object Tokens extends TokensCommon {
147147
final val minToken = EMPTY
148-
final val maxToken = XMLSTART
148+
final def maxToken = XMLSTART
149149

150150
final val INTERPOLATIONID = 10; enter(INTERPOLATIONID, "string interpolator")
151151
final val SYMBOLLIT = 11; enter(SYMBOLLIT, "symbol literal") // TODO: deprecate

0 commit comments

Comments
 (0)