hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exclude extraction of fake overridden properties

Browse Source
This commit is contained in:
Tamas Vajk
2022-01-13 11:08:27 +01:00
committed by Ian Lynagh
parent 55b8e4400d
commit 44b731c68e
3 changed files with 7 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -577,6 +577,12 @@ open class KotlinFileExtractor(
}
fun extractProperty(p: IrProperty, parentId: Label<out DbReftype>, extractBackingField: Boolean, typeSubstitution: TypeSubstitution?, classTypeArgs: List<IrTypeArgument>?) {
val visibility = p.visibility
if (visibility is DelegatedDescriptorVisibility && visibility.delegate == Visibilities.InvisibleFake) {
return
}
val id = useProperty(p, parentId)
val locId = tw.getLocation(p)
tw.writeKtProperties(id, p.name.asString())

4
java/ql/consistency-queries/modifiers.ql
View File

@@ -1,7 +1,5 @@
import java
from string mod, Location l
where
diagnostics(_, _, _, _, "Unexpected visibility: " + mod, _, l) and
not mod in ["invisible_fake"]
where diagnostics(_, _, _, _, "Unexpected visibility: " + mod, _, l)
select mod, l

46
java/ql/test/kotlin/library-tests/types/types.expected
View File

@@ -9,7 +9,6 @@
| ? extends AttributedCharacterIterator | Wildcard |
| ? extends BasicType | Wildcard |
| ? extends BigInteger | Wildcard |
| ? extends BoundMethodHandle | Wildcard |
| ? extends ByteBuffer | Wildcard |
| ? extends Callable<T> | Wildcard |
| ? extends Certificate | Wildcard |
@@ -27,12 +26,9 @@
| ? extends DoubleStream | Wildcard |
| ? extends E | Wildcard |
| ? extends Entry<? extends K,? extends V> | Wildcard |
| ? extends Entry<?,?> | Wildcard |
| ? extends Entry<?> | Wildcard |
| ? extends Entry<Identity,Entry<?>> | Wildcard |
| ? extends Entry<K,V> | Wildcard |
| ? extends Enum<?> | Wildcard |
| ? extends ExceptionNode | Wildcard |
| ? extends Field | Wildcard |
| ? extends FieldTypeSignature | Wildcard |
| ? extends File | Wildcard |
@@ -93,8 +89,6 @@
| ? extends WorkQueue | Wildcard |
| ? extends X | Wildcard |
| ? super A | Wildcard |
| ? super Class<?> | Wildcard |
| ? super Cleaner | Wildcard |
| ? super Double | Wildcard |
| ? super E | Wildcard |
| ? super Entry<K,V> | Wildcard |
@@ -110,10 +104,8 @@
| ? super StackFrame | Wildcard |
| ? super Stream<StackFrame> | Wildcard |
| ? super T | Wildcard |
| ? super ThreadLocal<?> | Wildcard |
| ? super U | Wildcard |
| ? super V | Wildcard |
| ? super Version<T> | Wildcard |
| A | TypeVariable |
| A[] | Array |
| AbstractChronology | Class |
@@ -126,9 +118,6 @@
| AbstractMap<?,?> | Class, ParameterizedType |
| AbstractMap<Identity,Entry<?>> | Class, ParameterizedType |
| AbstractMap<K,V> | Class, ParameterizedType |
| AbstractMap<Object,Object> | Class, ParameterizedType |
| AbstractMap<String,Chronology> | Class, ParameterizedType |
| AbstractMap<String,Object> | Class, ParameterizedType |
| AbstractOwnableSynchronizer | Class |
| AbstractQueuedSynchronizer | Class |
| AbstractRepository | Class, GenericType, ParameterizedType |
@@ -182,12 +171,9 @@
| Array<? extends DateTimePrinterParser> | Class, ParameterizedType |
| Array<? extends E> | Class, ParameterizedType |
| Array<? extends Entry<? extends K,? extends V>> | Class, ParameterizedType |
| Array<? extends Entry<?,?>> | Class, ParameterizedType |
| Array<? extends Entry<?>> | Class, ParameterizedType |
| Array<? extends Entry<Identity,Entry<?>>> | Class, ParameterizedType |
| Array<? extends Entry<K,V>> | Class, ParameterizedType |
| Array<? extends Enum<?>> | Class, ParameterizedType |
| Array<? extends ExceptionNode> | Class, ParameterizedType |
| Array<? extends Field> | Class, ParameterizedType |
| Array<? extends FieldTypeSignature> | Class, ParameterizedType |
| Array<? extends File> | Class, ParameterizedType |
@@ -265,14 +251,11 @@
| Array<DayOfWeek> | Class, ParameterizedType |
| Array<E> | Class, ParameterizedType |
| Array<Entry<? extends K,? extends V>> | Class, ParameterizedType |
| Array<Entry<?,?>> | Class, ParameterizedType |
| Array<Entry<?>> | Class, ParameterizedType |
| Array<Entry<Identity,Entry<?>>> | Class, ParameterizedType |
| Array<Entry<K,V>> | Class, ParameterizedType |
| Array<Entry> | Class, ParameterizedType |
| Array<Enum<?>> | Class, ParameterizedType |
| Array<Enum> | Class, ParameterizedType |
| Array<ExceptionNode> | Class, ParameterizedType |
| Array<ExtendedOption> | Class, ParameterizedType |
| Array<Field> | Class, ParameterizedType |
| Array<FieldTypeSignature> | Class, ParameterizedType |
@@ -510,7 +493,6 @@
| Class<> | Class, RawType |
| Class<>[] | Array |
| Class<? extends Annotation> | Class, ParameterizedType |
| Class<? extends BoundMethodHandle> | Class, ParameterizedType |
| Class<? extends FileAttributeView> | Class, ParameterizedType |
| Class<? extends T> | Class, ParameterizedType |
| Class<? extends Throwable> | Class, ParameterizedType |
@@ -520,7 +502,6 @@
| Class<?>[] | Array |
| Class<A> | Class, ParameterizedType |
| Class<Boolean> | Class, ParameterizedType |
| Class<BoundMethodHandle> | Class, ParameterizedType |
| Class<Byte> | Class, ParameterizedType |
| Class<Character> | Class, ParameterizedType |
| Class<Double> | Class, ParameterizedType |
@@ -532,8 +513,6 @@
| Class<NoSuchMemberException> | Class, ParameterizedType |
| Class<S> | Class, ParameterizedType |
| Class<Short> | Class, ParameterizedType |
| Class<SpeciesData> | Class, ParameterizedType |
| Class<String> | Class, ParameterizedType |
| Class<T> | Class, ParameterizedType |
| Class<U> | Class, ParameterizedType |
| Class<V> | Class, ParameterizedType |
@@ -606,7 +585,6 @@
| Collection<MemberName> | Interface, ParameterizedType |
| Collection<Method> | Interface, ParameterizedType |
| Collection<MethodHandle> | Interface, ParameterizedType |
| Collection<MethodType> | Interface, ParameterizedType |
| Collection<Modifier> | Interface, ParameterizedType |
| Collection<Module> | Interface, ParameterizedType |
| Collection<ModuleDescriptor> | Interface, ParameterizedType |
@@ -748,16 +726,10 @@
| ConcurrentHashMap | Class, GenericType, ParameterizedType |
| ConcurrentHashMap<?,?> | Class, ParameterizedType |
| ConcurrentHashMap<K,V> | Class, ParameterizedType |
| ConcurrentHashMap<Object,Object> | Class, ParameterizedType |
| ConcurrentHashMap<String,Chronology> | Class, ParameterizedType |
| ConcurrentHashMap<String,Object> | Class, ParameterizedType |
| ConcurrentMap | GenericType, Interface, ParameterizedType |
| ConcurrentMap<? extends WeakReference<Class<?>>,?> | Interface, ParameterizedType |
| ConcurrentMap<?,?> | Interface, ParameterizedType |
| ConcurrentMap<K,V> | Interface, ParameterizedType |
| ConcurrentMap<Object,Object> | Interface, ParameterizedType |
| ConcurrentMap<String,Chronology> | Interface, ParameterizedType |
| ConcurrentMap<String,Object> | Interface, ParameterizedType |
| ConcurrentWeakInternSet | Class, GenericType, ParameterizedType |
| ConcurrentWeakInternSet<MethodType> | Class, ParameterizedType |
| Condition | Interface |
@@ -861,15 +833,9 @@
| Entry | GenericType, Interface, ParameterizedType |
| Entry<? extends K,? extends V> | Interface, ParameterizedType |
| Entry<? extends K,? extends V>[] | Array |
| Entry<?,?> | Class, ParameterizedType |
| Entry<?,?> | Interface, ParameterizedType |
| Entry<?,?>[] | Array |
| Entry<?> | Class, ParameterizedType |
| Entry<?>[] | Array |
| Entry<Identity,Entry<?>> | Class, ParameterizedType |
| Entry<Identity,Entry<?>> | Interface, ParameterizedType |
| Entry<Identity,Entry<?>>[] | Array |
| Entry<Integer,PrefixTree> | Interface, ParameterizedType |
| Entry<K,V> | Class, ParameterizedType |
| Entry<K,V> | Interface, ParameterizedType |
| Entry<K,V>[] | Array |
@@ -937,7 +903,6 @@
| Error | Class |
| Exception | Class |
| ExceptionNode | Class |
| ExceptionNode[] | Array |
| Executable | Class |
| Executor | Interface |
| ExecutorService | Interface |
@@ -1057,7 +1022,6 @@
| Function<Float> | Interface, ParameterizedType |
| Function<Integer> | Interface, ParameterizedType |
| Function<Long> | Interface, ParameterizedType |
| Function<Object,Object> | Interface, ParameterizedType |
| Function<R> | Interface, ParameterizedType |
| Function<Short> | Interface, ParameterizedType |
| Function<String,ClassLoader> | Interface, ParameterizedType |
@@ -1183,7 +1147,6 @@
| Iterable<MemberName> | Interface, ParameterizedType |
| Iterable<Method> | Interface, ParameterizedType |
| Iterable<MethodHandle> | Interface, ParameterizedType |
| Iterable<MethodType> | Interface, ParameterizedType |
| Iterable<Modifier> | Interface, ParameterizedType |
| Iterable<Module> | Interface, ParameterizedType |
| Iterable<ModuleDescriptor> | Interface, ParameterizedType |
@@ -1275,7 +1238,6 @@
| List<MemberName> | Interface, ParameterizedType |
| List<Method> | Interface, ParameterizedType |
| List<MethodHandle> | Interface, ParameterizedType |
| List<MethodType> | Interface, ParameterizedType |
| List<ModuleLayer> | Interface, ParameterizedType |
| List<NamedFunction> | Interface, ParameterizedType |
| List<Runnable> | Interface, ParameterizedType |
@@ -1340,10 +1302,8 @@
| Map<Object,Object> | Interface, ParameterizedType |
| Map<String,?> | Interface, ParameterizedType |
| Map<String,AccessMode> | Interface, ParameterizedType |
| Map<String,Attribute> | Interface, ParameterizedType |
| Map<String,Boolean> | Interface, ParameterizedType |
| Map<String,Charset> | Interface, ParameterizedType |
| Map<String,Chronology> | Interface, ParameterizedType |
| Map<String,Class<?>> | Interface, ParameterizedType |
| Map<String,Exports> | Interface, ParameterizedType |
| Map<String,List<String>> | Interface, ParameterizedType |
@@ -1593,13 +1553,7 @@
| Reference<Version<?>> | Class, ParameterizedType |
| Reference<Version<T>> | Class, ParameterizedType |
| ReferenceQueue | Class, GenericType, ParameterizedType |
| ReferenceQueue<? super Class<?>> | Class, ParameterizedType |
| ReferenceQueue<? super Cleaner> | Class, ParameterizedType |
| ReferenceQueue<? super ForkJoinTask<?>> | Class, ParameterizedType |
| ReferenceQueue<? super Object> | Class, ParameterizedType |
| ReferenceQueue<? super T> | Class, ParameterizedType |
| ReferenceQueue<? super ThreadLocal<?>> | Class, ParameterizedType |
| ReferenceQueue<? super Version<T>> | Class, ParameterizedType |
| ReferenceQueue<Class<?>> | Class, ParameterizedType |
| ReferenceQueue<ForkJoinTask<?>> | Class, ParameterizedType |
| ReferenceQueue<Object> | Class, ParameterizedType |