Skip to content

C#: Fix DB inconsistencies with extends/2 #2293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
calumgrant wants to merge 2 commits into from
Closed

C#: Fix DB inconsistencies with extends/2 #2293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da85d51
C#: Do not extend Object in extends/2. This is because Roslyn will in…
calumgrant Nov 10, 2019
14e81e0
C#: Address review comment
calumgrant Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,14 @@ protected void PopulateType(TextWriter trapFile)

// Visit base types
var baseTypes = new List<Type>();
if (symbol.BaseType != null)
if (symbol.BaseType != null && symbol.BaseType.SpecialType != SpecialType.System_Object)
{
Type baseKey = Create(Context, symbol.BaseType);
trapFile.extend(this, baseKey.TypeRef);
if (symbol.TypeKind != TypeKind.Struct)
baseTypes.Add(baseKey);
}

if (symbol.TypeKind == TypeKind.Interface)
{
trapFile.extend(this, Create(Context, Context.Compilation.ObjectType));
}

if (!(base.symbol is IArrayTypeSymbol))
{
foreach (var t in base.symbol.Interfaces.Select(i=>Create(Context, i)))
Expand Down
8 changes: 7 additions & 1 deletion csharp/ql/src/semmle/code/csharp/Type.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,13 @@ class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_
}

/** Gets the immediate base class of this class, if any. */
Class getBaseClass() { extend(this, getTypeRef(result)) }
Class getBaseClass() {
extend(this, getTypeRef(result))
or
not extend(this, _) and
not this instanceof ObjectType and
result instanceof ObjectType
Copy link
Contributor

@tamasvajk tamasvajk Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this result instanceof ObjectType and not result = ObjectType?

Copy link
Contributor

@hvitved hvitved Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latter is not valid QL syntax, as the right-hand-side is a QL class and not an expression. result = any(ObjectType ot) would work, but instanceof is better IMO. Note that the extractor will guarantee that there is indeed only one element inside ObjectType.

}

/** Gets an immediate base interface of this type, if any. */
Interface getABaseInterface() { implement(this, getTypeRef(result)) }
Expand Down