File tree Expand file tree Collapse file tree 4 files changed +3
-7
lines changed Expand file tree Collapse file tree 4 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -367,9 +367,6 @@ object Flags {
367
367
/** Symbol is defined in a super call */
368
368
final val InSuperCall = commonFlag(46 , " <in supercall>" )
369
369
370
- /** Symbol with private access is accessed outside its private scope */
371
- final val NotJavaPrivate = commonFlag(47 , " <not-java-private>" )
372
-
373
370
/** Denotation is in train of being loaded and completed, used to catch cyclic dependencies */
374
371
final val Touched = commonFlag(48 , " <touched>" )
375
372
Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ class Constructors extends MiniPhaseTransform with SymTransformer { thisTransfor
56
56
private def mightBeDropped (sym : Symbol )(implicit ctx : Context ) =
57
57
sym.is(Private , butNot = KeeperFlags ) && ! sym.is(MutableParamAccessor )
58
58
59
- private final val KeeperFlags = Method | Lazy | NotJavaPrivate
59
+ private final val KeeperFlags = Method | Lazy
60
60
private final val MutableParamAccessor = allOf(Mutable , ParamAccessor )
61
61
62
62
override def transformTemplate (tree : Template )(implicit ctx : Context , info : TransformerInfo ): Tree = {
Original file line number Diff line number Diff line change @@ -290,11 +290,10 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
290
290
val (newOwner, maybeStatic) =
291
291
if (lOwner is Package ) (local.topLevelClass, JavaStatic )
292
292
else (lOwner, EmptyFlags )
293
- val maybeNotJavaPrivate = if (calledFromInner(local)) NotJavaPrivate else EmptyFlags
294
293
local.copySymDenotation(
295
294
owner = newOwner,
296
295
name = newName(local),
297
- initFlags = local.flags &~ InSuperCall | Private | maybeStatic | maybeNotJavaPrivate ,
296
+ initFlags = local.flags &~ InSuperCall | Private | maybeStatic,
298
297
info = liftedInfo(local)).installAfter(thisTransform)
299
298
if (local.isClass)
300
299
for (member <- local.asClass.info.decls)
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ class PrivateToStatic extends MiniPhase with SymTransformer { thisTransform =>
33
33
def shouldBeStatic (sd : SymDenotation )(implicit ctx : Context ) =
34
34
sd.current(ctx.withPhase(thisTransform)).asSymDenotation
35
35
.is(PrivateMethod , butNot = Immovable ) &&
36
- ( sd.owner.is(Trait ) || sd.is( NotJavaPrivate ) )
36
+ sd.owner.is(Trait )
37
37
38
38
override def transformSym (sd : SymDenotation )(implicit ctx : Context ): SymDenotation =
39
39
if (shouldBeStatic(sd)) {
You can’t perform that action at this time.
0 commit comments