From d1d52086d7061a13b453a42cf47ae5310527156f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 3 Jun 2013 22:08:06 +0400 Subject: [PATCH] Do not add pre-loaded built-ins when serializing --- .../frontend/builtins/jet/.kotlin_class_names | Bin 1496 -> 748 bytes compiler/frontend/builtins/jet/.kotlin_package | Bin 568 -> 284 bytes .../frontend/builtins/jet/Nothing.kotlin_class | 3 ++- .../resolve/lazy/AbstractLazyResolveTest.java | 2 +- .../lang/resolve/lazy/LazyResolveTestUtil.java | 10 +++++++--- .../builtins/BuiltInsSerializer.java | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 045b44f859bb3b0a6f885fc7b79c085e5a944bbe..403d64543c4c8408d9df1efd8d448795049d011d 100644 GIT binary patch literal 748 zcmW;J*-H>n6bIlLv(0wR2Mes!dXvg}=|R&6i8PCh1eYR$K=6MMf*=TjAP5SApwuj+ zY|~8BtfwL{GfOj5+q7)4)zZpu9Qf|fKR?AhQ|o1QPGQPOpK@M z6kVyN#dN9}(VJ>!%%YkdbExLVJgWJzfNEhZqFNkFsFubus^zhQYGtgVS{-Ys*2X%j z^|67fIyO>mip^AgVhdG+*h;l6wo~nhom9JGH`SilOSLcdQyqwdREOd))sZ+#bu5lk zorsfE6Qds0sW?q_CYn%9h-Or0;~drbxIlF=E>T^MD^yqG8rAiiT6eanGQ>j`}o2n}6P}L3gx>Wt(zb(};8c{V4_P$ipVDC#cj}}xdqZL)_XhYSu zqUgrLQFe|lRMizlU*=JE569{k{iz1TAgY=eOf|Hk=*aWLJ(a^^I7Km}qU^yn3f`-7 fM2w^wT~V-(f5uUiV=D^2U*)8jOf@B@(y4y|w`{kW diff --git a/compiler/frontend/builtins/jet/.kotlin_package b/compiler/frontend/builtins/jet/.kotlin_package index 4f5cbd858a38348e53ed10db4b2aa259ab24f944..8c736d5d0e428810b02f8de3ab6092759c8d6445 100644 GIT binary patch delta 24 gcmdnNGKXn`(Zm$Ri6=rQ2QVs5p2X-dS%^s(0C3(21^@s6 delta 60 zcmbQkw1Z`W(S%@L1r9bXHZCRsMhQj(v5AQy6N8l|28T{84VkziapK8fVId^>KqnTU GN@W1Vf(>i{ diff --git a/compiler/frontend/builtins/jet/Nothing.kotlin_class b/compiler/frontend/builtins/jet/Nothing.kotlin_class index a3c038ba10f..7510be6ae4e 100644 --- a/compiler/frontend/builtins/jet/Nothing.kotlin_class +++ b/compiler/frontend/builtins/jet/Nothing.kotlin_class @@ -1,2 +1,3 @@ - ÇR Â0B + Ç2 +R Â0B r \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java index eff3cd5df36..e5088be1dca 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java @@ -71,7 +71,7 @@ public abstract class AbstractLazyResolveTest extends JetLiteFixture { } }); - KotlinCodeAnalyzer resolveSession = LazyResolveTestUtil.resolveLazilyWithSession(files, getEnvironment()); + KotlinCodeAnalyzer resolveSession = LazyResolveTestUtil.resolveLazilyWithSession(files, getEnvironment(), true); NamespaceDescriptor actual = resolveSession.getPackageDescriptor(Name.identifier("test")); Assert.assertNotNull("Package 'test' was not found", actual); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index db94115e40e..74a63978ac2 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -87,7 +87,7 @@ public class LazyResolveTestUtil { return module; } - public static KotlinCodeAnalyzer resolveLazilyWithSession(List files, JetCoreEnvironment environment) { + public static KotlinCodeAnalyzer resolveLazilyWithSession(List files, JetCoreEnvironment environment, final boolean addBuiltIns) { JetTestUtils.newTrace(environment); ModuleDescriptorImpl javaModule = AnalyzerFacadeForJVM.createJavaModule(""); @@ -117,7 +117,7 @@ public class LazyResolveTestUtil { @NotNull WritableScope namespaceMemberScope ) { FqName fqName = DescriptorUtils.getFQName(namespaceDescriptor).toSafe(); - if (new FqName("jet").equals(fqName)) { + if (KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(fqName) && addBuiltIns) { namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope()); } if (psiClassFinder.findPsiPackage(fqName) != null) { @@ -135,7 +135,11 @@ public class LazyResolveTestUtil { } public static ModuleDescriptor resolveLazily(List files, JetCoreEnvironment environment) { - return resolveLazilyWithSession(files, environment).getRootModuleDescriptor(); + return resolveLazily(files, environment, true); + } + + public static ModuleDescriptor resolveLazily(List files, JetCoreEnvironment environment, boolean addBuiltIns) { + return resolveLazilyWithSession(files, environment, addBuiltIns).getRootModuleDescriptor(); } @NotNull diff --git a/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java b/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java index abee53776a0..a586531a06c 100644 --- a/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java +++ b/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java @@ -38,7 +38,7 @@ public class BuiltInsSerializer { JetCoreEnvironment environment = new JetCoreEnvironment(rootDisposable, configuration); List files = JetTestUtils.loadToJetFiles(environment, sourceFiles); - ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(files, environment); + ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(files, environment, false); FqName fqName = FqName.topLevel(Name.identifier(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING)); NamespaceDescriptor namespace = module.getNamespace(fqName);