Fix errors in the global initialization checker when compiling bootstrapped dotty #23429
Conversation
| targetType.asInstanceOf[ExprType].resType | ||
| else | ||
| targetType.asInstanceOf[MethodType].resType | ||
| val returnType = targetType.finalResultType |
| @@ -1326,7 +1318,8 @@ class Objects(using Context @constructorOnly): | |||
| report.warning("[Internal error] top-level class should have `Package` as outer, class = " + klass.show + ", outer = " + outer.show + ", " + Trace.show, Trace.position) | |||
| (Bottom, Env.NoEnv) | |||
| else | |||
| val outerCls = klass.owner.enclosingClass.asClass | |||
| // enclosingClass is specially handled for java static terms, so use `lexicallyEnclosingClass` here | |||
| val outerCls = klass.owner.lexicallyEnclosingClass.asClass | |||
There was a problem hiding this comment.
Nice catch and comment 👍
EnzeXing
force-pushed
the
fix-errors-when-testing-global-init-checker
branch
from
3c254fd to
83b6cf2
Compare
EnzeXing
force-pushed
the
fix-errors-when-testing-global-init-checker
branch
from
83b6cf2 to
ec0d1f9
Compare
| @@ -1054,6 +1046,8 @@ class Objects(using Context @constructorOnly): | |||
| else if target.equals(defn.Predef_classOf) then | |||
| // Predef.classOf is a stub method in tasty and is replaced in backend | |||
| UnknownValue | |||
| else if target.is(Flags.JavaDefined) then | |||
There was a problem hiding this comment.
I added the modification here to skip java-defined methods. It is worth noting that java-defined methods has source, but its defTree is incomplete, so we should not evaluate them anyway
There was a problem hiding this comment.
I don't understand what way the defTree is incomplete. The definition of hasSource is:
def hasSource(using Context): Boolean = !sym.defTree.isEmptyBut anyway, perhaps hasSource should check for Java-defined and return false for all Java-defined symbols. @liufengyun what do you think?
There was a problem hiding this comment.
Here's the defTree of the runtimeVersionMajor method defined in JDK9Reflectors.java:
DefDef(runtimeVersionMajor,List(List(ValDef(version,Ident(Object),EmptyTree))),Ident(Integer),Select(Select(Select(Ident(_root_),scala),Predef),???))
The defTree is not empty, but contains an ??? part.
There was a problem hiding this comment.
It's a good idea to change hasSource such that it return false for all Java-defined symbols.
There was a problem hiding this comment.
It's a good idea to change
hasSourcesuch that it return false for all Java-defined symbols.
Done
EnzeXing
force-pushed
the
fix-errors-when-testing-global-init-checker
branch
from
ec0d1f9 to
13440a7
Compare
With this fix, the global initialization checker can be run when compiling bootstrapped dotty and reported warnings in the dotty source code
[test_scala2_library_tasty]