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

JS: enable release coroutines

Browse Source
This commit is contained in:
Anton Bannykh
2018-07-08 22:40:32 +03:00
committed by Anton Bannykh
parent f77e023210
commit 4872c97929
5 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
+2 -1
View File
@@ -177,7 +177,8 @@ public final class K2JSTranslator {
List<DeclarationDescriptor> scope = translationResult.getFileMemberScopes().get(file);
assert scope != null : "Could not find descriptors for file: " + file;
ProtoBuf.PackageFragment packagePart = serializationUtil.serializeDescriptors(
bindingTrace.getBindingContext(), moduleDescriptor, scope, file.getPackageFqName());
bindingTrace.getBindingContext(), moduleDescriptor, scope, file.getPackageFqName(),
CommonConfigurationKeysKt.getLanguageVersionSettings(config.getConfiguration()));
File ioFile = VfsUtilCore.virtualToIoFile(file.getVirtualFile());
incrementalResults.processPackagePart(ioFile, packagePart.toByteArray(), binaryAst);
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java
+2 -2
View File
@@ -49,7 +49,7 @@ import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptor
import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelectorAsSimpleName;
public final class ReferenceTranslator {
private static final Set<FqNameUnsafe> DECLARATIONS_WITHOUT_SIZE_EFFECTS = new HashSet<>(Arrays.asList(
private static final Set<FqNameUnsafe> DECLARATIONS_WITHOUT_SIDE_EFFECTS = new HashSet<>(Arrays.asList(
new FqNameUnsafe("kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED"),
new FqNameUnsafe("kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED"),
KotlinBuiltIns.FQ_NAMES.unit
@@ -145,7 +145,7 @@ public final class ReferenceTranslator {
}
private static boolean isValueWithoutSideEffect(@NotNull DeclarationDescriptor descriptor) {
return DECLARATIONS_WITHOUT_SIZE_EFFECTS.contains(DescriptorUtils.getFqName(descriptor));
return DECLARATIONS_WITHOUT_SIDE_EFFECTS.contains(DescriptorUtils.getFqName(descriptor));
}
@NotNull