Separate DataFlowInfo into interface & implementation
This commit is contained in:
Alexander Udalov
+19
-150
@@ -16,173 +16,42 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.lang.resolve.calls.autocasts;
|
package org.jetbrains.jet.lang.resolve.calls.autocasts;
|
||||||
|
|
||||||
import com.google.common.collect.*;
|
import com.google.common.collect.ImmutableMap;
|
||||||
|
import com.google.common.collect.Multimaps;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.jet.lang.types.JetType;
|
import org.jetbrains.jet.lang.types.JetType;
|
||||||
import org.jetbrains.jet.lang.types.TypeUtils;
|
|
||||||
import org.jetbrains.jet.util.CommonSuppliers;
|
import org.jetbrains.jet.util.CommonSuppliers;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import static org.jetbrains.jet.lang.resolve.calls.autocasts.Nullability.NOT_NULL;
|
public interface DataFlowInfo {
|
||||||
|
public static final DataFlowInfo EMPTY = new DataFlowInfoImpl(
|
||||||
public class DataFlowInfo {
|
|
||||||
public static DataFlowInfo EMPTY = new DataFlowInfo(
|
|
||||||
ImmutableMap.<DataFlowValue, Nullability>of(),
|
ImmutableMap.<DataFlowValue, Nullability>of(),
|
||||||
Multimaps.newListMultimap(Collections.<DataFlowValue, Collection<JetType>>emptyMap(), CommonSuppliers.<JetType>getArrayListSupplier()));
|
Multimaps.newListMultimap(Collections.<DataFlowValue, Collection<JetType>>emptyMap(),
|
||||||
|
CommonSuppliers.<JetType>getArrayListSupplier()));
|
||||||
private final ImmutableMap<DataFlowValue, Nullability> nullabilityInfo;
|
|
||||||
/** Also immutable */
|
|
||||||
private final ListMultimap<DataFlowValue, JetType> typeInfo;
|
|
||||||
|
|
||||||
private DataFlowInfo(ImmutableMap<DataFlowValue, Nullability> nullabilityInfo, ListMultimap<DataFlowValue, JetType> typeInfo) {
|
|
||||||
this.nullabilityInfo = nullabilityInfo;
|
|
||||||
this.typeInfo = typeInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public Nullability getNullability(@NotNull DataFlowValue a) {
|
Nullability getNullability(@NotNull DataFlowValue key);
|
||||||
if (!a.isStableIdentifier()) return a.getImmanentNullability();
|
|
||||||
Nullability nullability = nullabilityInfo.get(a);
|
|
||||||
if (nullability == null) {
|
|
||||||
nullability = a.getImmanentNullability();
|
|
||||||
}
|
|
||||||
return nullability;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean putNullability(@NotNull Map<DataFlowValue, Nullability> map, @NotNull DataFlowValue value, @NotNull Nullability nullability) {
|
|
||||||
if (!value.isStableIdentifier()) return false;
|
|
||||||
return map.put(value, nullability) != nullability;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public List<JetType> getPossibleTypes(DataFlowValue key) {
|
List<JetType> getPossibleTypes(@NotNull DataFlowValue key);
|
||||||
JetType originalType = key.getType();
|
|
||||||
List<JetType> types = typeInfo.get(key);
|
|
||||||
Nullability nullability = getNullability(key);
|
|
||||||
if (nullability.canBeNull()) {
|
|
||||||
return types;
|
|
||||||
}
|
|
||||||
List<JetType> enrichedTypes = Lists.newArrayListWithCapacity(types.size());
|
|
||||||
if (originalType.isNullable()) {
|
|
||||||
enrichedTypes.add(TypeUtils.makeNotNullable(originalType));
|
|
||||||
}
|
|
||||||
for (JetType type: types) {
|
|
||||||
if (type.isNullable()) {
|
|
||||||
enrichedTypes.add(TypeUtils.makeNotNullable(type));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
enrichedTypes.add(type);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return enrichedTypes;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public DataFlowInfo equate(@NotNull DataFlowValue a, @NotNull DataFlowValue b) {
|
DataFlowInfo equate(@NotNull DataFlowValue a, @NotNull DataFlowValue b);
|
||||||
Map<DataFlowValue, Nullability> builder = Maps.newHashMap(nullabilityInfo);
|
|
||||||
Nullability nullabilityOfA = getNullability(a);
|
|
||||||
Nullability nullabilityOfB = getNullability(b);
|
|
||||||
|
|
||||||
boolean changed = false;
|
|
||||||
changed |= putNullability(builder, a, nullabilityOfA.refine(nullabilityOfB));
|
|
||||||
changed |= putNullability(builder, b, nullabilityOfB.refine(nullabilityOfA));
|
|
||||||
return changed ? new DataFlowInfo(ImmutableMap.copyOf(builder), typeInfo) : this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public DataFlowInfo disequate(@NotNull DataFlowValue a, @NotNull DataFlowValue b) {
|
DataFlowInfo disequate(@NotNull DataFlowValue a, @NotNull DataFlowValue b);
|
||||||
Map<DataFlowValue, Nullability> builder = Maps.newHashMap(nullabilityInfo);
|
|
||||||
Nullability nullabilityOfA = getNullability(a);
|
|
||||||
Nullability nullabilityOfB = getNullability(b);
|
|
||||||
|
|
||||||
boolean changed = false;
|
|
||||||
changed |= putNullability(builder, a, nullabilityOfA.refine(nullabilityOfB.invert()));
|
|
||||||
changed |= putNullability(builder, b, nullabilityOfB.refine(nullabilityOfA.invert()));
|
|
||||||
return changed ? new DataFlowInfo(ImmutableMap.copyOf(builder), typeInfo) : this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public DataFlowInfo establishSubtyping(@NotNull DataFlowValue[] values, @NotNull JetType type) {
|
DataFlowInfo establishSubtyping(@NotNull DataFlowValue[] values, @NotNull JetType type);
|
||||||
ListMultimap<DataFlowValue, JetType> newTypeInfo = copyTypeInfo();
|
|
||||||
Map<DataFlowValue, Nullability> newNullabilityInfo = Maps.newHashMap(nullabilityInfo);
|
|
||||||
boolean changed = false;
|
|
||||||
for (DataFlowValue value : values) {
|
|
||||||
// if (!value.isStableIdentifier()) continue;
|
|
||||||
changed = true;
|
|
||||||
newTypeInfo.put(value, type);
|
|
||||||
if (!type.isNullable()) {
|
|
||||||
putNullability(newNullabilityInfo, value, NOT_NULL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!changed) return this;
|
|
||||||
return new DataFlowInfo(ImmutableMap.copyOf(newNullabilityInfo), newTypeInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ListMultimap<DataFlowValue, JetType> copyTypeInfo() {
|
@NotNull
|
||||||
ListMultimap<DataFlowValue, JetType> newTypeInfo = Multimaps.newListMultimap(Maps.<DataFlowValue, Collection<JetType>>newHashMap(), CommonSuppliers.<JetType>getArrayListSupplier());
|
DataFlowInfo and(@NotNull DataFlowInfo other);
|
||||||
newTypeInfo.putAll(typeInfo);
|
|
||||||
return newTypeInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DataFlowInfo and(DataFlowInfo other) {
|
@NotNull
|
||||||
Map<DataFlowValue, Nullability> nullabilityMapBuilder = Maps.newHashMap();
|
DataFlowInfo or(@NotNull DataFlowInfo other);
|
||||||
nullabilityMapBuilder.putAll(nullabilityInfo);
|
|
||||||
for (Map.Entry<DataFlowValue, Nullability> entry : other.nullabilityInfo.entrySet()) {
|
|
||||||
DataFlowValue key = entry.getKey();
|
|
||||||
Nullability otherFlags = entry.getValue();
|
|
||||||
Nullability thisFlags = nullabilityInfo.get(key);
|
|
||||||
if (thisFlags != null) {
|
|
||||||
nullabilityMapBuilder.put(key, thisFlags.and(otherFlags));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
nullabilityMapBuilder.put(key, otherFlags);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ListMultimap<DataFlowValue, JetType> newTypeInfo = copyTypeInfo();
|
boolean hasTypeInfoConstraints();
|
||||||
newTypeInfo.putAll(other.typeInfo);
|
|
||||||
return new DataFlowInfo(ImmutableMap.copyOf(nullabilityMapBuilder), newTypeInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DataFlowInfo or(DataFlowInfo other) {
|
|
||||||
Map<DataFlowValue, Nullability> builder = Maps.newHashMap(nullabilityInfo);
|
|
||||||
builder.keySet().retainAll(other.nullabilityInfo.keySet());
|
|
||||||
for (Map.Entry<DataFlowValue, Nullability> entry : builder.entrySet()) {
|
|
||||||
DataFlowValue key = entry.getKey();
|
|
||||||
Nullability thisFlags = entry.getValue();
|
|
||||||
Nullability otherFlags = other.nullabilityInfo.get(key);
|
|
||||||
assert (otherFlags != null);
|
|
||||||
builder.put(key, thisFlags.or(otherFlags));
|
|
||||||
}
|
|
||||||
|
|
||||||
ListMultimap<DataFlowValue, JetType> newTypeInfo = Multimaps.newListMultimap(Maps.<DataFlowValue, Collection<JetType>>newHashMap(), CommonSuppliers.<JetType>getArrayListSupplier());
|
|
||||||
|
|
||||||
Set<DataFlowValue> keys = Sets.newHashSet(typeInfo.keySet());
|
|
||||||
keys.retainAll(other.typeInfo.keySet());
|
|
||||||
|
|
||||||
for (DataFlowValue key : keys) {
|
|
||||||
Collection<JetType> thisTypes = typeInfo.get(key);
|
|
||||||
Collection<JetType> otherTypes = other.typeInfo.get(key);
|
|
||||||
|
|
||||||
Collection<JetType> newTypes = Sets.newHashSet(thisTypes);
|
|
||||||
newTypes.retainAll(otherTypes);
|
|
||||||
|
|
||||||
newTypeInfo.putAll(key, newTypes);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new DataFlowInfo(ImmutableMap.copyOf(builder), newTypeInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasTypeInfoConstraints() {
|
|
||||||
return !typeInfo.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
if (typeInfo.isEmpty() && nullabilityInfo.isEmpty()) {
|
|
||||||
return "EMPTY";
|
|
||||||
}
|
|
||||||
return "Non-trivial DataFlowInfo";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+202
@@ -0,0 +1,202 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2012 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.jet.lang.resolve.calls.autocasts;
|
||||||
|
|
||||||
|
import com.google.common.collect.*;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.jet.lang.types.JetType;
|
||||||
|
import org.jetbrains.jet.lang.types.TypeUtils;
|
||||||
|
import org.jetbrains.jet.util.CommonSuppliers;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import static org.jetbrains.jet.lang.resolve.calls.autocasts.Nullability.NOT_NULL;
|
||||||
|
|
||||||
|
public class DataFlowInfoImpl implements DataFlowInfo {
|
||||||
|
private final ImmutableMap<DataFlowValue, Nullability> nullabilityInfo;
|
||||||
|
/** Also immutable */
|
||||||
|
private final ListMultimap<DataFlowValue, JetType> typeInfo;
|
||||||
|
|
||||||
|
/* package */ DataFlowInfoImpl(
|
||||||
|
@NotNull ImmutableMap<DataFlowValue, Nullability> nullabilityInfo,
|
||||||
|
@NotNull ListMultimap<DataFlowValue, JetType> typeInfo
|
||||||
|
) {
|
||||||
|
this.nullabilityInfo = nullabilityInfo;
|
||||||
|
this.typeInfo = typeInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@NotNull
|
||||||
|
public Nullability getNullability(@NotNull DataFlowValue key) {
|
||||||
|
if (!key.isStableIdentifier()) return key.getImmanentNullability();
|
||||||
|
Nullability nullability = nullabilityInfo.get(key);
|
||||||
|
if (nullability == null) {
|
||||||
|
nullability = key.getImmanentNullability();
|
||||||
|
}
|
||||||
|
return nullability;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean putNullability(@NotNull Map<DataFlowValue, Nullability> map, @NotNull DataFlowValue value, @NotNull Nullability nullability) {
|
||||||
|
if (!value.isStableIdentifier()) return false;
|
||||||
|
return map.put(value, nullability) != nullability;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@NotNull
|
||||||
|
public List<JetType> getPossibleTypes(@NotNull DataFlowValue key) {
|
||||||
|
JetType originalType = key.getType();
|
||||||
|
List<JetType> types = typeInfo.get(key);
|
||||||
|
Nullability nullability = getNullability(key);
|
||||||
|
if (nullability.canBeNull()) {
|
||||||
|
return types;
|
||||||
|
}
|
||||||
|
List<JetType> enrichedTypes = Lists.newArrayListWithCapacity(types.size());
|
||||||
|
if (originalType.isNullable()) {
|
||||||
|
enrichedTypes.add(TypeUtils.makeNotNullable(originalType));
|
||||||
|
}
|
||||||
|
for (JetType type: types) {
|
||||||
|
if (type.isNullable()) {
|
||||||
|
enrichedTypes.add(TypeUtils.makeNotNullable(type));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
enrichedTypes.add(type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return enrichedTypes;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@NotNull
|
||||||
|
public DataFlowInfo equate(@NotNull DataFlowValue a, @NotNull DataFlowValue b) {
|
||||||
|
Map<DataFlowValue, Nullability> builder = Maps.newHashMap(nullabilityInfo);
|
||||||
|
Nullability nullabilityOfA = getNullability(a);
|
||||||
|
Nullability nullabilityOfB = getNullability(b);
|
||||||
|
|
||||||
|
boolean changed = false;
|
||||||
|
changed |= putNullability(builder, a, nullabilityOfA.refine(nullabilityOfB));
|
||||||
|
changed |= putNullability(builder, b, nullabilityOfB.refine(nullabilityOfA));
|
||||||
|
return changed ? new DataFlowInfoImpl(ImmutableMap.copyOf(builder), typeInfo) : this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@NotNull
|
||||||
|
public DataFlowInfo disequate(@NotNull DataFlowValue a, @NotNull DataFlowValue b) {
|
||||||
|
Map<DataFlowValue, Nullability> builder = Maps.newHashMap(nullabilityInfo);
|
||||||
|
Nullability nullabilityOfA = getNullability(a);
|
||||||
|
Nullability nullabilityOfB = getNullability(b);
|
||||||
|
|
||||||
|
boolean changed = false;
|
||||||
|
changed |= putNullability(builder, a, nullabilityOfA.refine(nullabilityOfB.invert()));
|
||||||
|
changed |= putNullability(builder, b, nullabilityOfB.refine(nullabilityOfA.invert()));
|
||||||
|
return changed ? new DataFlowInfoImpl(ImmutableMap.copyOf(builder), typeInfo) : this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@NotNull
|
||||||
|
public DataFlowInfo establishSubtyping(@NotNull DataFlowValue[] values, @NotNull JetType type) {
|
||||||
|
ListMultimap<DataFlowValue, JetType> newTypeInfo = copyTypeInfo();
|
||||||
|
Map<DataFlowValue, Nullability> newNullabilityInfo = Maps.newHashMap(nullabilityInfo);
|
||||||
|
boolean changed = false;
|
||||||
|
for (DataFlowValue value : values) {
|
||||||
|
// if (!value.isStableIdentifier()) continue;
|
||||||
|
changed = true;
|
||||||
|
newTypeInfo.put(value, type);
|
||||||
|
if (!type.isNullable()) {
|
||||||
|
putNullability(newNullabilityInfo, value, NOT_NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!changed) return this;
|
||||||
|
return new DataFlowInfoImpl(ImmutableMap.copyOf(newNullabilityInfo), newTypeInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ListMultimap<DataFlowValue, JetType> copyTypeInfo() {
|
||||||
|
ListMultimap<DataFlowValue, JetType> newTypeInfo = Multimaps.newListMultimap(Maps.<DataFlowValue, Collection<JetType>>newHashMap(), CommonSuppliers.<JetType>getArrayListSupplier());
|
||||||
|
newTypeInfo.putAll(typeInfo);
|
||||||
|
return newTypeInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public DataFlowInfo and(@NotNull DataFlowInfo otherInfo) {
|
||||||
|
DataFlowInfoImpl other = (DataFlowInfoImpl) otherInfo;
|
||||||
|
Map<DataFlowValue, Nullability> nullabilityMapBuilder = Maps.newHashMap();
|
||||||
|
nullabilityMapBuilder.putAll(nullabilityInfo);
|
||||||
|
for (Map.Entry<DataFlowValue, Nullability> entry : other.nullabilityInfo.entrySet()) {
|
||||||
|
DataFlowValue key = entry.getKey();
|
||||||
|
Nullability otherFlags = entry.getValue();
|
||||||
|
Nullability thisFlags = nullabilityInfo.get(key);
|
||||||
|
if (thisFlags != null) {
|
||||||
|
nullabilityMapBuilder.put(key, thisFlags.and(otherFlags));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
nullabilityMapBuilder.put(key, otherFlags);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ListMultimap<DataFlowValue, JetType> newTypeInfo = copyTypeInfo();
|
||||||
|
newTypeInfo.putAll(other.typeInfo);
|
||||||
|
return new DataFlowInfoImpl(ImmutableMap.copyOf(nullabilityMapBuilder), newTypeInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public DataFlowInfo or(@NotNull DataFlowInfo otherInfo) {
|
||||||
|
DataFlowInfoImpl other = (DataFlowInfoImpl) otherInfo;
|
||||||
|
Map<DataFlowValue, Nullability> builder = Maps.newHashMap(nullabilityInfo);
|
||||||
|
builder.keySet().retainAll(other.nullabilityInfo.keySet());
|
||||||
|
for (Map.Entry<DataFlowValue, Nullability> entry : builder.entrySet()) {
|
||||||
|
DataFlowValue key = entry.getKey();
|
||||||
|
Nullability thisFlags = entry.getValue();
|
||||||
|
Nullability otherFlags = other.nullabilityInfo.get(key);
|
||||||
|
assert (otherFlags != null);
|
||||||
|
builder.put(key, thisFlags.or(otherFlags));
|
||||||
|
}
|
||||||
|
|
||||||
|
ListMultimap<DataFlowValue, JetType> newTypeInfo = Multimaps.newListMultimap(Maps.<DataFlowValue, Collection<JetType>>newHashMap(), CommonSuppliers.<JetType>getArrayListSupplier());
|
||||||
|
|
||||||
|
Set<DataFlowValue> keys = Sets.newHashSet(typeInfo.keySet());
|
||||||
|
keys.retainAll(other.typeInfo.keySet());
|
||||||
|
|
||||||
|
for (DataFlowValue key : keys) {
|
||||||
|
Collection<JetType> thisTypes = typeInfo.get(key);
|
||||||
|
Collection<JetType> otherTypes = other.typeInfo.get(key);
|
||||||
|
|
||||||
|
Collection<JetType> newTypes = Sets.newHashSet(thisTypes);
|
||||||
|
newTypes.retainAll(otherTypes);
|
||||||
|
|
||||||
|
newTypeInfo.putAll(key, newTypes);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new DataFlowInfoImpl(ImmutableMap.copyOf(builder), newTypeInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasTypeInfoConstraints() {
|
||||||
|
return !typeInfo.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
if (typeInfo.isEmpty() && nullabilityInfo.isEmpty()) {
|
||||||
|
return "EMPTY";
|
||||||
|
}
|
||||||
|
return "Non-trivial DataFlowInfo";
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user