diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java index 5dc42a3d083..b0aa43ed7e0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.util.slicedmap.BasicWritableSlice; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -33,11 +32,9 @@ public class JavaBindingContext { /** * @see BindingContext#NAMESPACE_IS_SRC */ - public static final WritableSlice JAVA_NAMESPACE_KIND = - Slices.createSimpleSlice(); + public static final WritableSlice JAVA_NAMESPACE_KIND = Slices.createSimpleSlice(); - public static final WritableSlice> LOAD_FROM_JAVA_SIGNATURE_ERRORS = - new BasicWritableSlice>(Slices.ONLY_REWRITE_TO_EQUAL, true); + public static final WritableSlice> LOAD_FROM_JAVA_SIGNATURE_ERRORS = Slices.createCollectiveSlice(); private JavaBindingContext() { } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java index a4f4709f834..0feacda9caf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.util.slicedmap.BasicWritableSlice; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -37,8 +36,8 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.CANNOT_INFER_VISIBILITY; public class TraceBasedErrorReporter implements ErrorReporter { private static final Logger LOG = Logger.getInstance(TraceBasedErrorReporter.class); - public static final WritableSlice ABI_VERSION_ERRORS = - new BasicWritableSlice(Slices.ONLY_REWRITE_TO_EQUAL, true); + public static final WritableSlice ABI_VERSION_ERRORS = Slices.createCollectiveSlice(); + private BindingTrace trace; @Inject diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java b/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java index c3310fcebb3..bf3276e13e5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java +++ b/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java @@ -64,6 +64,10 @@ public class Slices { return new BasicWritableSlice(ONLY_REWRITE_TO_EQUAL); } + public static WritableSlice createCollectiveSlice() { + return new BasicWritableSlice(ONLY_REWRITE_TO_EQUAL, true); + } + public static WritableSlice createSimpleSetSlice() { return createRemovableSetSlice(); }