Java/C++/C#: Fix Java Content.getType and getContainerType to match C# and fix C# tests.

This commit is contained in:
Anders Schack-Mulligen
2019-12-17 11:51:58 +01:00
parent a97e7bd3b2
commit ca08097b56
22 changed files with 250 additions and 49 deletions

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config

View File

@@ -531,7 +531,7 @@ private predicate parameterFlow(
read(mid, f, node) and
readStoreCand1(f, unbind(config)) and
summary = midsum.readStep(f) and
t1 = getErasedRepr(f.getType()) and
t1 = f.getType() and
t1 = t2
)
or
@@ -581,7 +581,7 @@ private predicate parameterFlowReturn(
not exists(int pos | kind.(ParamUpdateReturnKind).getPosition() = pos and p.isParameterOf(_, pos))
}
pragma[noinline]
pragma[nomagic]
private predicate argumentFlowsThrough0(
DataFlowCall call, ArgumentNode arg, ReturnKindExt kind, DataFlowType t1, DataFlowType t2,
Summary summary, Configuration config