@@ -927,7 +927,7 @@ class JSCodeGen()(using genCtx: Context) {
927927 val className = encodeClassName(classSym)
928928 val body = js.Block (
929929 js.LoadModule (className),
930- js.SelectStatic (className, fieldIdent)(irTpe))
930+ js.SelectStatic (fieldIdent)(irTpe))
931931 staticGetterDefs += js.MethodDef (
932932 js.MemberFlags .empty.withNamespace(js.MemberNamespace .PublicStatic ),
933933 encodeStaticMemberSym(f), originalName, Nil , irTpe,
@@ -2243,10 +2243,7 @@ class JSCodeGen()(using genCtx: Context) {
22432243 if (isStaticModule(currentClassSym) && ! isModuleInitialized.get.value &&
22442244 currentMethodSym.get.isClassConstructor) {
22452245 isModuleInitialized.get.value = true
2246- val className = encodeClassName(currentClassSym)
2247- val thisType = jstpe.ClassType (className)
2248- val initModule = js.StoreModule (className, js.This ()(thisType))
2249- js.Block (superCall, initModule)
2246+ js.Block (superCall, js.StoreModule ())
22502247 } else {
22512248 superCall
22522249 }
@@ -4463,13 +4460,12 @@ class JSCodeGen()(using genCtx: Context) {
44634460 js.JSSelect (qual, genPrivateFieldsSymbol()),
44644461 encodeFieldSymAsStringLiteral(sym))
44654462 } else {
4466- js.JSPrivateSelect (qual, encodeClassName(sym.owner),
4467- encodeFieldSym(sym))
4463+ js.JSPrivateSelect (qual, encodeFieldSym(sym))
44684464 }
44694465
44704466 (f, true )
44714467 } else if (sym.hasAnnotation(jsdefn.JSExportTopLevelAnnot )) {
4472- val f = js.SelectStatic (encodeClassName(sym.owner), encodeFieldSym(sym))(jstpe.AnyType )
4468+ val f = js.SelectStatic (encodeFieldSym(sym))(jstpe.AnyType )
44734469 (f, true )
44744470 } else if (sym.hasAnnotation(jsdefn.JSExportStaticAnnot )) {
44754471 val jsName = sym.getAnnotation(jsdefn.JSExportStaticAnnot ).get.argumentConstantString(0 ).getOrElse {
@@ -4495,9 +4491,9 @@ class JSCodeGen()(using genCtx: Context) {
44954491
44964492 val f =
44974493 if sym.is(JavaStatic ) then
4498- js.SelectStatic (className, fieldIdent)(irType)
4494+ js.SelectStatic (fieldIdent)(irType)
44994495 else
4500- js.Select (qual, className, fieldIdent)(irType)
4496+ js.Select (qual, fieldIdent)(irType)
45014497
45024498 (f, boxed)
45034499 }
0 commit comments