Skip to content

Commit

Permalink
Fix segfault caused by UnusedLabelCheck
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladiwostok committed Dec 13, 2023
1 parent 2b7d5ec commit 5dc990d
Showing 1 changed file with 22 additions and 12 deletions.
34 changes: 22 additions & 12 deletions src/dscanner/analysis/unused_label.d
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import dmd.tokens;
/**
* Checks for labels that are never used.
*/
extern(C++) class UnusedLabelCheck(AST) : BaseAnalyzerDmd
extern (C++) class UnusedLabelCheck(AST) : BaseAnalyzerDmd
{
alias visit = BaseAnalyzerDmd.visit;
mixin AnalyzerInfo!"unused_label_check";

extern(D) this(string fileName, bool skipTests = false)
extern (D) this(string fileName, bool skipTests = false)
{
super(fileName, skipTests);
}
Expand All @@ -30,17 +30,18 @@ extern(C++) class UnusedLabelCheck(AST) : BaseAnalyzerDmd
override void visit(AST.LabelStatement ls)
{
Label* label = ls.ident.toString() in current;

if (label is null)
{
current[ls.ident.toString()] = Label(ls.ident.toString(), ls.loc.linnum, ls.loc.charnum, false);
current[ls.ident.toString()] = Label(ls.ident.toString(),
ls.loc.linnum, ls.loc.charnum, false);
}
else
{
label.line = ls.loc.linnum;
label.column = ls.loc.charnum;
}

super.visit(ls);
}

Expand Down Expand Up @@ -86,7 +87,7 @@ extern(C++) class UnusedLabelCheck(AST) : BaseAnalyzerDmd
super.visit(fd);
popScope();
}

override void visit(AST.AsmStatement as)
{
if (!as.tokens)
Expand All @@ -97,9 +98,18 @@ extern(C++) class UnusedLabelCheck(AST) : BaseAnalyzerDmd
if (as.tokens[0].ident && as.tokens[0].ident.toString()[0] == 'j')
jmp = true;

if (as.tokens[0].ident)
{
auto asmInstr = as.tokens[0].ident.toString();
if (asmInstr !is null && asmInstr[0] == 'j')
jmp = true;
}

// Last argument of the jmp instruction will be the label
Token *label;
for (label = as.tokens; label.next; label = label.next) {}
Token* label;
for (label = as.tokens; label.next; label = label.next)
{
}

if (jmp && label.ident)
labelUsed(label.ident.toString());
Expand All @@ -115,9 +125,9 @@ private:
bool used;
}

extern(D) Label[const(char)[]][] stack;
extern (D) Label[const(char)[]][] stack;

extern(D) auto ref current()
extern (D) auto ref current()
{
return stack[$ - 1];
}
Expand Down Expand Up @@ -146,7 +156,7 @@ private:
stack.length--;
}

extern(D) void labelUsed(const(char)[] name)
extern (D) void labelUsed(const(char)[] name)
{
Label* entry = name in current;
if (entry is null)
Expand Down Expand Up @@ -239,4 +249,4 @@ unittest
}c, sac);

stderr.writeln("Unittest for UnusedLabelCheck passed.");
}
}

0 comments on commit 5dc990d

Please sign in to comment.