Skip to content

Commit

Permalink
Merge pull request #1715 from joakim-brannstrom/mutate-fix-aors-mutant
Browse files Browse the repository at this point in the history 
mutate: no aor mutations for pointers
  • Loading branch information
@joakim-brannstrom-work1
joakim-brannstrom-work1 authored Oct 30, 2023
2 parents 2d6cbd2 + b59a37e commit 81adbf1
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 62 deletions.
7 changes: 7 additions & 0 deletions plugin/mutate/source/dextool/plugin/mutate/backend/analyze/ast.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ class AstPrintVisitor : DepthFirstVisitor {
}
}

if (auto tmp = cast(Operator) n)
formattedWrite(buf, " o:%s", tmp.isOverloaded);

if (auto tmp = cast(BinaryOp) n) {
if (tmp.lhs !is null)
formattedWrite(buf, " l:%s", tmp.lhs.id);
Expand Down Expand Up @@ -678,6 +681,10 @@ class FloatLiteral : Expr {
/// The operator itself in a binary operator expression.
class Operator : Node {
mixin(nodeImpl!(typeof(this)));

// TODO: crude way of carrying operator overload info but needed. Refactor
// in the future to be more precise.
bool isOverloaded;
}

/** A block of code such such as a local scope enclosed by brackets, `{}`.
Expand Down
2 changes: 2 additions & 0 deletions plugin/mutate/source/dextool/plugin/mutate/backend/analyze/pass_clang.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,7 @@ final class BaseVisitor : ExtendedVisitor {
CXCursorKind.classTemplatePartialSpecialization, CXCursorKind.functionTemplate) != 0;

astOp.operator = op.operator;
astOp.operator.isOverloaded = op.isOverload;
astOp.operator.blacklist = isBlacklist(cursor, op.opLoc);

op.put(nstack.back, ast.get);
Expand Down Expand Up @@ -1237,6 +1238,7 @@ final class BaseVisitor : ExtendedVisitor {
CXCursorKind.classTemplatePartialSpecialization, CXCursorKind.functionTemplate) != 0;

astOp.operator = op.operator;
astOp.operator.isOverloaded = op.isOverload;
astOp.operator.blacklist = isBlacklist(cursor, op.opLoc);
astOp.operator.schemaBlacklist = blockSchema;

Expand Down
10 changes: 3 additions & 7 deletions plugin/mutate/source/dextool/plugin/mutate/backend/analyze/pass_mutant.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,16 +786,12 @@ class MutantVisitor : DepthFirstVisitor {
{
import dextool.plugin.mutate.backend.mutation_type.aor;

auto m = aorMutations(AorInfo(n.kind, ast.type(n.lhs), ast.type(n.rhs)));
op ~= m.op;
auto m = aorMutations(AorInfo(n.kind, ast.type(n.lhs),
ast.type(n.rhs), n.operator.isOverloaded));
op ~= m.op ~ m.simple;
lhs ~= m.lhs;
rhs ~= m.rhs;
}
{
import dextool.plugin.mutate.backend.mutation_type.aors;

op ~= aorsMutations(n.kind);
}
if (isDirectParent(Kind.Block)) {
expr ~= stmtDelMutations(n.kind);
}
Expand Down
34 changes: 20 additions & 14 deletions plugin/mutate/source/dextool/plugin/mutate/backend/mutation_type/aor.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,48 +24,50 @@ struct AorInfo {
Kind operator;
Type lhs;
Type rhs;
bool isOverloaded;
}

auto aorMutations(AorInfo info) @safe {
// TODO: for AORs it is probably better to do one op and then lhs+rhs.
alias Rval = Tuple!(Mutation.Kind[], "op", Mutation.Kind[], "lhs", Mutation.Kind[], "rhs");
alias Rval = Tuple!(Mutation.Kind[], "op", Mutation.Kind[], "lhs",
Mutation.Kind[], "rhs", Mutation.Kind, "simple");

Rval rval;
switch (info.operator) with (Mutation.Kind) {
case Kind.OpAdd:
rval = Rval([aorMul, aorDiv, aorRem, aorSub], null, null);
rval = Rval([aorMul, aorDiv, aorRem, aorSub], null, null, aorsSub);
break;
case Kind.OpDiv:
rval = Rval([aorMul, aorRem, aorAdd, aorSub], null, null);
rval = Rval([aorMul, aorRem, aorAdd, aorSub], null, null, aorsMul);
break;
case Kind.OpMod:
rval = Rval([aorMul, aorDiv, aorAdd, aorSub], null, null);
rval = Rval([aorMul, aorDiv, aorAdd, aorSub], null, null, aorsDiv);
break;
case Kind.OpMul:
rval = Rval([aorDiv, aorRem, aorAdd, aorSub], null, null);
rval = Rval([aorDiv, aorRem, aorAdd, aorSub], null, null, aorsDiv);
break;
case Kind.OpSub:
rval = Rval([aorMul, aorDiv, aorRem, aorAdd], null, null);
rval = Rval([aorMul, aorDiv, aorRem, aorAdd], null, null, aorsAdd);
break;
case Kind.OpAssignAdd:
rval = Rval([aorDivAssign, aorRemAssign,
aorMulAssign, aorSubAssign], null, null);
aorMulAssign, aorSubAssign], null, null, aorsSubAssign);
break;
case Kind.OpAssignDiv:
rval = Rval([aorAddAssign, aorRemAssign,
aorMulAssign, aorSubAssign], null, null);
aorMulAssign, aorSubAssign], null, null, aorsMulAssign);
break;
case Kind.OpAssignMod:
rval = Rval([aorAddAssign, aorDivAssign,
aorMulAssign, aorSubAssign], null, null);
aorMulAssign, aorSubAssign], null, null, aorsDivAssign);
break;
case Kind.OpAssignMul:
rval = Rval([aorAddAssign, aorDivAssign,
aorRemAssign, aorSubAssign], null, null);
aorRemAssign, aorSubAssign], null, null, aorsDivAssign);
break;
case Kind.OpAssignSub:
rval = Rval([aorAddAssign, aorDivAssign,
aorRemAssign, aorMulAssign], null, null);
aorRemAssign, aorMulAssign], null, null, aorsAddAssign);
break;
default:
}
Expand All @@ -76,9 +78,13 @@ auto aorMutations(AorInfo info) @safe {
rval = typeof(rval).init;
} else if (info.lhs.kind.among(TypeKind.unordered, TypeKind.bottom)
|| info.rhs.kind.among(TypeKind.unordered, TypeKind.bottom)) {
// TODO: unfortunately this also blocks operator overloading which is [unordered, unordered]
// block aor when the type is a pointer
//rval = typeof(rval).init;
if (info.isOverloaded) {
// TODO: unfortunately this also blocks operator overloading which is [unordered, unordered].
// block aor when the type is a pointer
} else {
// block AOR for pointers.
rval = typeof(rval).init;
}
} else if (info.lhs.kind == TypeKind.continues || info.rhs.kind == TypeKind.continues) {
// modulo do not work when either side is a floating point.
rval.op = rval.op.filter!(a => !a.among(Mutation.Kind.aorRem,
Expand Down
42 changes: 1 addition & 41 deletions plugin/mutate/source/dextool/plugin/mutate/backend/mutation_type/aors.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,7 @@ one at http://mozilla.org/MPL/2.0/.
*/
module dextool.plugin.mutate.backend.mutation_type.aors;

import dextool.plugin.mutate.backend.type;
import dextool.plugin.mutate.backend.analyze.ast;

Mutation.Kind aorsMutations(Kind operand) @safe {
Mutation.Kind rval;
switch (operand) with (Mutation.Kind) {
case Kind.OpAdd:
rval = aorsSub;
break;
case Kind.OpDiv:
rval = aorsMul;
break;
case Kind.OpMod:
rval = aorsDiv;
break;
case Kind.OpMul:
rval = aorsDiv;
break;
case Kind.OpSub:
rval = aorsAdd;
break;
case Kind.OpAssignAdd:
rval = aorsSubAssign;
break;
case Kind.OpAssignDiv:
rval = aorsMulAssign;
break;
case Kind.OpAssignMod:
rval = aorsDivAssign;
break;
case Kind.OpAssignMul:
rval = aorsDivAssign;
break;
case Kind.OpAssignSub:
rval = aorsAddAssign;
break;
default:
}

return rval;
}
import dextool.plugin.mutate.backend.type : Mutation;

immutable Mutation.Kind[] aorsMutationsAll;
immutable Mutation.Kind[] aorsAssignMutationsAll;
Expand Down

0 comments on commit 81adbf1

Please sign in to comment.