azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: do not use getBuiltInsModule to compute module name

Browse Source 
The intention of this code was to use the name "kotlin" for the builtins
module, in case we're using builtins loaded from the compiler class
loader (whose module is created in
`KotlinBuiltIns.createBuiltInsModule`). However,
`getBuiltIns().getBuiltInsModule()` may refer not necessarily to the
builtins module, but also to any valid module where the builtins are
visible from, therefore its name would be computed incorrectly. Use the
module name instead to determine if it's a synthetic builtins module
created in `createBuiltInsModule`
This commit is contained in:
Alexander Udalov
2019-01-17 19:14:30 +01:00
parent d5fd160fd3
commit 0659d0cba9
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
+2 -15
View File
@@ -711,24 +711,13 @@ public final class StaticContext {
if (currentModule == module) { if (currentModule == module) {
return currentModuleAsImported; return currentModuleAsImported;
} }
String moduleName = suggestModuleName(module); String moduleName = JsDescriptorUtils.getModuleName(module);
if (UNKNOWN_EXTERNAL_MODULE_NAME.equals(moduleName)) return null; if (UNKNOWN_EXTERNAL_MODULE_NAME.equals(moduleName)) return null;
return getImportedModule(moduleName, null); return getImportedModule(moduleName, null);
} }
@NotNull
private static String suggestModuleName(@NotNull ModuleDescriptor module) {
if (module == module.getBuiltIns().getBuiltInsModule()) {
return Namer.KOTLIN_LOWER_NAME;
}
else {
String moduleName = module.getName().asString();
return moduleName.substring(1, moduleName.length() - 1);
}
}
@NotNull @NotNull
public JsImportedModule getImportedModule(@NotNull String baseName, @Nullable DeclarationDescriptor descriptor) { public JsImportedModule getImportedModule(@NotNull String baseName, @Nullable DeclarationDescriptor descriptor) {
String plainName = descriptor != null && config.getModuleKind() == ModuleKind.UMD ? getPlainId(descriptor) : null; String plainName = descriptor != null && config.getModuleKind() == ModuleKind.UMD ? getPlainId(descriptor) : null;
@@ -835,9 +824,7 @@ public final class StaticContext {
@Nullable @Nullable
public JsExpression exportModuleForInline(@NotNull ModuleDescriptor declaration) { public JsExpression exportModuleForInline(@NotNull ModuleDescriptor declaration) {
if (getCurrentModule().getBuiltIns().getBuiltInsModule() == declaration) return null; String moduleName = JsDescriptorUtils.getModuleName(declaration);
String moduleName = suggestModuleName(declaration);
if (moduleName.equals(Namer.KOTLIN_LOWER_NAME)) return null; if (moduleName.equals(Namer.KOTLIN_LOWER_NAME)) return null;
JsImportedModule importedModule = getJsImportedModule(declaration); JsImportedModule importedModule = getJsImportedModule(declaration);
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
+8 -3
View File
@@ -149,11 +149,16 @@ public final class JsDescriptorUtils {
@NotNull @NotNull
public static String getModuleName(@NotNull DeclarationDescriptor descriptor) { public static String getModuleName(@NotNull DeclarationDescriptor descriptor) {
ModuleDescriptor moduleDescriptor = DescriptorUtils.getContainingModule(findRealInlineDeclaration(descriptor)); return getModuleName(DescriptorUtils.getContainingModule(findRealInlineDeclaration(descriptor)));
if (DescriptorUtils.getContainingModule(descriptor) == moduleDescriptor.getBuiltIns().getBuiltInsModule()) { }
@NotNull
public static String getModuleName(@NotNull ModuleDescriptor module) {
if (module.getName().equals(KotlinBuiltIns.BUILTINS_MODULE_NAME)) {
return Namer.KOTLIN_LOWER_NAME; return Namer.KOTLIN_LOWER_NAME;
} }
String moduleName = moduleDescriptor.getName().asString();
String moduleName = module.getName().asString();
return moduleName.substring(1, moduleName.length() - 1); return moduleName.substring(1, moduleName.length() - 1);
} }