Do not add pre-loaded built-ins when serializing

compiler/frontend/builtins/jet/Nothing.kotlin_class

@@ -1,2 +1,3 @@
- ΗRΒ
0B
+ Η2
+
RΒ
0B
 r

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);

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java

@@ -87,7 +87,7 @@ public class LazyResolveTestUtil {
         return module;
     }
 
-    public static KotlinCodeAnalyzer resolveLazilyWithSession(List<JetFile> files, JetCoreEnvironment environment) {
+    public static KotlinCodeAnalyzer resolveLazilyWithSession(List<JetFile> files, JetCoreEnvironment environment, final boolean addBuiltIns) {
         JetTestUtils.newTrace(environment);
 
         ModuleDescriptorImpl javaModule = AnalyzerFacadeForJVM.createJavaModule("<java module>");
@@ -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<JetFile> files, JetCoreEnvironment environment) {
-        return resolveLazilyWithSession(files, environment).getRootModuleDescriptor();
+        return resolveLazily(files, environment, true);
+    }
+
+    public static ModuleDescriptor resolveLazily(List<JetFile> files, JetCoreEnvironment environment, boolean addBuiltIns) {
+        return resolveLazilyWithSession(files, environment, addBuiltIns).getRootModuleDescriptor();
     }
 
     @NotNull

generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java

@@ -38,7 +38,7 @@ public class BuiltInsSerializer {
         JetCoreEnvironment environment = new JetCoreEnvironment(rootDisposable, configuration);
         List<JetFile> 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);