Skip to content

Commit 7daf53f

Browse files
tamasvajktamasvajk
committed
Add regenerated models after rebase
1 parent 2138e49 commit 7daf53f

File tree

5 files changed

+2
-21
lines changed

5 files changed

+2
-21
lines changed

‎java/ql/lib/semmle/code/java/frameworks/kotlin/NegativeStdLibGenerated.qll

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,10 @@ private class StdLibGeneratedNegativesummaryCsv extends NegativeSummaryModelCsv
201201
"kotlin.collections;ArraysKt;contains;(int[],int);generated",
202202
"kotlin.collections;ArraysKt;contains;(long[],long);generated",
203203
"kotlin.collections;ArraysKt;contains;(short[],short);generated",
204-
"kotlin.collections;ArraysKt;contentDeepEquals;(Object[],Object[]);generated",
205204
"kotlin.collections;ArraysKt;contentDeepEqualsInline;(Object[],Object[]);generated",
206205
"kotlin.collections;ArraysKt;contentDeepEqualsNullable;(Object[],Object[]);generated",
207-
"kotlin.collections;ArraysKt;contentDeepHashCode;(Object[]);generated",
208206
"kotlin.collections;ArraysKt;contentDeepHashCodeInline;(Object[]);generated",
209207
"kotlin.collections;ArraysKt;contentDeepHashCodeNullable;(Object[]);generated",
210-
"kotlin.collections;ArraysKt;contentDeepToString;(Object[]);generated",
211208
"kotlin.collections;ArraysKt;contentDeepToStringInline;(Object[]);generated",
212209
"kotlin.collections;ArraysKt;contentDeepToStringNullable;(Object[]);generated",
213210
"kotlin.collections;ArraysKt;contentEquals;(Object[],Object[]);generated",
@@ -282,12 +279,6 @@ private class StdLibGeneratedNegativesummaryCsv extends NegativeSummaryModelCsv
282279
"kotlin.collections;ArraysKt;copyOf;(long[],int);generated",
283280
"kotlin.collections;ArraysKt;copyOf;(short[]);generated",
284281
"kotlin.collections;ArraysKt;copyOf;(short[],int);generated",
285-
"kotlin.collections;ArraysKt;copyOfRange;(boolean[],int,int);generated",
286-
"kotlin.collections;ArraysKt;copyOfRange;(double[],int,int);generated",
287-
"kotlin.collections;ArraysKt;copyOfRange;(float[],int,int);generated",
288-
"kotlin.collections;ArraysKt;copyOfRange;(int[],int,int);generated",
289-
"kotlin.collections;ArraysKt;copyOfRange;(long[],int,int);generated",
290-
"kotlin.collections;ArraysKt;copyOfRange;(short[],int,int);generated",
291282
"kotlin.collections;ArraysKt;copyOfRangeInline;(boolean[],int,int);generated",
292283
"kotlin.collections;ArraysKt;copyOfRangeInline;(double[],int,int);generated",
293284
"kotlin.collections;ArraysKt;copyOfRangeInline;(float[],int,int);generated",
@@ -2782,7 +2773,6 @@ private class StdLibGeneratedNegativesummaryCsv extends NegativeSummaryModelCsv
27822773
"kotlin.jvm.internal;TypeParameterReference;hashCode;();generated",
27832774
"kotlin.jvm.internal;TypeParameterReference;toString;();generated",
27842775
"kotlin.jvm.internal;TypeReference;equals;(Object);generated",
2785-
"kotlin.jvm.internal;TypeReference;getFlags$kotlin_stdlib;();generated",
27862776
"kotlin.jvm.internal;TypeReference;hashCode;();generated",
27872777
"kotlin.jvm;JvmClassMappingKt;getAnnotationClass;(Annotation);generated",
27882778
"kotlin.jvm;JvmClassMappingKt;getDeclaringJavaClass;(Enum);generated",
@@ -3642,7 +3632,6 @@ private class StdLibGeneratedNegativesummaryCsv extends NegativeSummaryModelCsv
36423632
"kotlin.text;StringsKt;removeRange;(String,IntRange);generated",
36433633
"kotlin.text;StringsKt;removeRange;(String,int,int);generated",
36443634
"kotlin.text;StringsKt;replace;(String,String,String,boolean);generated",
3645-
"kotlin.text;StringsKt;replace;(String,char,char,boolean);generated",
36463635
"kotlin.text;StringsKt;replaceIndent;(String,String);generated",
36473636
"kotlin.text;StringsKt;replaceIndentByMargin;(String,String,String);generated",
36483637
"kotlin.text;StringsKt;replaceRange;(String,IntRange,CharSequence);generated",
@@ -4419,9 +4408,7 @@ private class StdLibGeneratedNegativesummaryCsv extends NegativeSummaryModelCsv
44194408
"kotlin;UnsupportedOperationException;UnsupportedOperationException;(String,Throwable);generated",
44204409
"kotlin;UnsupportedOperationException;UnsupportedOperationException;(Throwable);generated",
44214410
"kotlin;UseExperimental;UseExperimental;(KClass[]);generated",
4422-
"kotlin;UseExperimental;markerClass;();generated",
4423-
"kotlin;WasExperimental;WasExperimental;(KClass[]);generated",
4424-
"kotlin;WasExperimental;markerClass;();generated"
4411+
"kotlin;UseExperimental;markerClass;();generated"
44254412
]
44264413
}
44274414
}

‎java/ql/lib/semmle/code/java/frameworks/kotlin/StdLibGenerated.qll

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ private class StdLibGeneratedSummaryCsv extends SummaryModelCsv {
9494
"kotlin.collections;ArraysKt;false;copyOf;(byte[],int);;Argument[0];ReturnValue;taint;generated",
9595
"kotlin.collections;ArraysKt;false;copyOf;(char[]);;Argument[0];ReturnValue;taint;generated",
9696
"kotlin.collections;ArraysKt;false;copyOf;(char[],int);;Argument[0];ReturnValue;taint;generated",
97-
"kotlin.collections;ArraysKt;false;copyOfRange;(Object[],int,int);;Argument[0].ArrayElement;ReturnValue;taint;generated",
98-
"kotlin.collections;ArraysKt;false;copyOfRange;(byte[],int,int);;Argument[0];ReturnValue;taint;generated",
99-
"kotlin.collections;ArraysKt;false;copyOfRange;(char[],int,int);;Argument[0];ReturnValue;taint;generated",
10097
"kotlin.collections;ArraysKt;false;copyOfRangeInline;(Object[],int,int);;Argument[0].ArrayElement;ReturnValue;taint;generated",
10198
"kotlin.collections;ArraysKt;false;copyOfRangeInline;(byte[],int,int);;Argument[0];ReturnValue;taint;generated",
10299
"kotlin.collections;ArraysKt;false;copyOfRangeInline;(char[],int,int);;Argument[0];ReturnValue;taint;generated",
@@ -1271,7 +1268,6 @@ private class StdLibGeneratedSummaryCsv extends SummaryModelCsv {
12711268
"kotlin.jvm.internal;TypeReference;false;TypeReference;(KClassifier,List,KType,int);;Argument[2];Argument[-1];taint;generated",
12721269
"kotlin.jvm.internal;TypeReference;false;TypeReference;(KClassifier,List,boolean);;Argument[0];Argument[-1];taint;generated",
12731270
"kotlin.jvm.internal;TypeReference;false;TypeReference;(KClassifier,List,boolean);;Argument[1].Element;Argument[-1];taint;generated",
1274-
"kotlin.jvm.internal;TypeReference;false;getPlatformTypeUpperBound$kotlin_stdlib;();;Argument[-1];ReturnValue;taint;generated",
12751271
"kotlin.jvm.internal;TypeReference;false;toString;();;Argument[-1];ReturnValue;taint;generated",
12761272
"kotlin.properties;ObservableProperty;true;ObservableProperty;(Object);;Argument[0];Argument[-1];taint;generated",
12771273
"kotlin.random;PlatformRandomKt;false;asJavaRandom;(Random);;Argument[0];ReturnValue;taint;generated",
@@ -1688,6 +1684,7 @@ private class StdLibGeneratedSummaryCsv extends SummaryModelCsv {
16881684
"kotlin.text;StringsKt;false;replace;(CharSequence,Regex,Function1);;Argument[0];ReturnValue;taint;generated",
16891685
"kotlin.text;StringsKt;false;replace;(CharSequence,Regex,String);;Argument[0];ReturnValue;taint;generated",
16901686
"kotlin.text;StringsKt;false;replace;(CharSequence,Regex,String);;Argument[2];ReturnValue;taint;generated",
1687+
"kotlin.text;StringsKt;false;replace;(String,char,char,boolean);;Argument[0];ReturnValue;taint;generated",
16911688
"kotlin.text;StringsKt;false;replaceAfter;(String,String,String,String);;Argument[3];ReturnValue;taint;generated",
16921689
"kotlin.text;StringsKt;false;replaceAfter;(String,char,String,String);;Argument[3];ReturnValue;taint;generated",
16931690
"kotlin.text;StringsKt;false;replaceAfterLast;(String,String,String,String);;Argument[3];ReturnValue;taint;generated",

‎java/ql/test/library-tests/dataflow/external-models/sinks.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
invalidModelRow
2-
| Dubious name "getPlatformTypeUpperBound$kotlin_stdlib" in summary model. |
32
#select
43
| B.java:6:11:6:14 | arg1 | qltest |
54
| B.java:9:5:9:33 | this <.method> | qltest-arg |

‎java/ql/test/library-tests/dataflow/external-models/srcs.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
invalidModelRow
2-
| Dubious name "getPlatformTypeUpperBound$kotlin_stdlib" in summary model. |
32
#select
43
| A.java:6:9:6:14 | src1(...) | qltest |
54
| A.java:6:9:6:14 | src1(...) | qltest-all-overloads |

‎java/ql/test/library-tests/dataflow/external-models/steps.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
invalidModelRow
2-
| Dubious name "getPlatformTypeUpperBound$kotlin_stdlib" in summary model. |
32
#select
43
| C.java:6:16:6:19 | arg1 | C.java:6:5:6:20 | stepArgRes(...) |
54
| C.java:10:16:10:21 | argIn1 | C.java:10:24:10:30 | argOut1 [post update] |

0 commit comments

Comments
 (0)