Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions csharp/change-notes/2021-04-23-model-error-extraction.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lgtm,codescanning
* Program model errors are now extracted in standalone extraction.
22 changes: 16 additions & 6 deletions csharp/extractor/Semmle.Extraction/Context.cs
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,27 @@ private void ExtractionError(Message msg)
Extractor.Message(msg);
}

private void ExtractionError(InternalError error)
{
ExtractionError(new Message(error.Message, error.EntityText, CreateLocation(error.Location), error.StackTrace, Severity.Error));
}

private void ReportError(InternalError error)
{
if (!Extractor.Standalone)
throw error;

ExtractionError(error);
}

/// <summary>
/// Signal an error in the program model.
/// </summary>
/// <param name="node">The syntax node causing the failure.</param>
/// <param name="msg">The error message.</param>
public void ModelError(SyntaxNode node, string msg)
{
if (!Extractor.Standalone)
throw new InternalError(node, msg);
ReportError(new InternalError(node, msg));
}

/// <summary>
Expand All @@ -394,8 +406,7 @@ public void ModelError(SyntaxNode node, string msg)
/// <param name="msg">The error message.</param>
public void ModelError(ISymbol symbol, string msg)
{
if (!Extractor.Standalone)
throw new InternalError(symbol, msg);
ReportError(new InternalError(symbol, msg));
}

/// <summary>
Expand All @@ -404,8 +415,7 @@ public void ModelError(ISymbol symbol, string msg)
/// <param name="msg">The error message.</param>
public void ModelError(string msg)
{
if (!Extractor.Standalone)
throw new InternalError(msg);
ReportError(new InternalError(msg));
}

/// <summary>
Expand Down
63 changes: 63 additions & 0 deletions csharp/ql/src/Diagnostics/DiagnosticExtractionErrors.ql
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/**
* @name Extraction errors
* @description List all errors reported by the extractor or the compiler. Extractor errors are
* limited to those files where there are no compilation errors.
* @kind diagnostic
* @id cs/diagnostics/extraction-errors
*/

import csharp
import semmle.code.csharp.commons.Diagnostics

private newtype TDiagnosticError =
TCompilerError(CompilerError c) or
TExtractorError(ExtractorError e)

abstract private class DiagnosticError extends TDiagnosticError {
abstract string getMessage();

abstract string toString();

abstract Location getLocation();

string getLocationMessage() {
if getLocation().getFile().fromSource()
then result = " in " + getLocation().getFile()
else result = ""
}
}

private class DiagnosticCompilerError extends DiagnosticError {
CompilerError c;

DiagnosticCompilerError() { this = TCompilerError(c) }

override string getMessage() {
result = "Compiler error" + this.getLocationMessage() + ": " + c.getMessage()
}

override string toString() { result = c.toString() }

override Location getLocation() { result = c.getLocation() }
}

private class DiagnosticExtractorError extends DiagnosticError {
ExtractorError e;

DiagnosticExtractorError() {
this = TExtractorError(e) and
not exists(CompilerError ce | ce.getLocation().getFile() = e.getLocation().getFile())
}

override string getMessage() {
result =
"Unexpected " + e.getOrigin() + " error" + this.getLocationMessage() + ": " + e.getText()
}

override string toString() { result = e.toString() }

override Location getLocation() { result = e.getLocation() }
}

from DiagnosticError error
select error.getMessage(), 2
17 changes: 17 additions & 0 deletions csharp/ql/src/Diagnostics/DiagnosticNoExtractionErrors.ql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* @name Successfully extracted files
* @description A list of all files in the source code directory that were extracted
* without encountering an extraction or compiler error in the file.
* @kind diagnostic
* @id cs/diagnostics/successfully-extracted-files
*/

import csharp
import semmle.code.csharp.commons.Diagnostics

from File file
where
file.fromSource() and
not exists(ExtractorError e | e.getLocation().getFile() = file) and
not exists(CompilerError e | e.getLocation().getFile() = file)
select file, ""
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the "" needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is needed. This is probably how we indicate that these results are success ones. See also here.

4 changes: 4 additions & 0 deletions csharp/ql/test/library-tests/diagnostics/A.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
public class A
{
public void M() { }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| Unexpected C# extractor error in Program.cs: Unable to resolve target for call. (Compilation error?) | 2 |
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Diagnostics/DiagnosticExtractionErrors.ql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| A.cs:0:0:0:0 | A.cs | |
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Diagnostics/DiagnosticNoExtractionErrors.ql
17 changes: 17 additions & 0 deletions csharp/ql/test/library-tests/diagnostics/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// semmle-extractor-options: --standalone

using System;

class Class
{
static void Main(string[] args)
{
int z = GetParamLength(__arglist(1, 2));
}

public static int GetParamLength(__arglist)
{
ArgIterator iterator = new ArgIterator(__arglist);
return iterator.GetRemainingCount();
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
compilationMessages
extractorMessages
| errors.cs:8:1:8:22 | Namespace not found |
| errors.cs:24:31:24:32 | Failed to determine type |
| errors.cs:24:31:24:40 | Failed to determine type |
| errors.cs:24:31:24:40 | Unable to resolve target for call. (Compilation error?) |
| errors.cs:24:38:24:39 | Failed to determine type |
| errors.cs:57:20:57:20 | Failed to determine type |
| errors.cs:93:45:93:45 | Failed to determine type |
| errors.cs:93:45:93:45 | Failed to resolve name |
| errors.cs:94:45:94:45 | Failed to determine type |
| errors.cs:94:45:94:45 | Failed to resolve name |
| file://:0:0:0:0 | Extracting default argument value 'object RecordNumber = default' instead of 'object RecordNumber = -1'. The latter is not supported in C#. |