Skip to content

Fix: donot add RET in SystemCall.Enum.cs #1912

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

Merged
shargon merged 2 commits into from
Jul 19, 2026
Merged

Fix: donot add RET in SystemCall.Enum.cs #1912

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
0fb804b
Fix: donot add RET in SystemCall.Enum.cs
Wi1l-B0t Jul 19, 2026
3a67e5c
Merge branch 'master-n3' into fix.RET-in-loop
ajara87 Jul 19, 2026
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
74 changes: 31 additions & 43 deletions src/Neo.Compiler.CSharp/MethodConvert/System/SystemCall.Enum.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ private static void HandleEnumIsDefinedByName(MethodConvert methodConvert, Seman

var enumMembers = enumTypeSymbol.GetMembers().OfType<IFieldSymbol>()
.Where(field => field is { HasConstantValue: true, IsImplicitlyDeclared: false }).ToArray();

var endTarget = new JumpTarget();
foreach (var t in enumMembers)
{
methodConvert.Dup(); // Duplicate input name
Expand All @@ -359,18 +359,17 @@ private static void HandleEnumIsDefinedByName(MethodConvert methodConvert, Seman

var nextCheck = new JumpTarget();
methodConvert.JumpIfNot(nextCheck); // If not equal, check next

methodConvert.Drop(); // Remove the duplicated input name
methodConvert.Push(true); // Push true (enum name is defined)
methodConvert.Ret(); // Return true
methodConvert.JumpAlways(endTarget);

nextCheck.Instruction = methodConvert.Nop();
}

// No match found
methodConvert.Drop(); // Remove the input name
methodConvert.Push(false); // Push false (enum name is not defined)
methodConvert.Ret(); // Return false
endTarget.Instruction = methodConvert.Nop();
}

/// <summary>
Expand Down Expand Up @@ -401,6 +400,7 @@ private static void HandleEnumGetName(MethodConvert methodConvert, SemanticModel

var enumMembers = enumTypeSymbol.GetMembers().OfType<IFieldSymbol>()
.Where(field => field is { HasConstantValue: true, IsImplicitlyDeclared: false }).ToArray();
var endTarget = new JumpTarget();
foreach (var t in enumMembers)
{
methodConvert.Dup(); // Duplicate input value
Expand All @@ -411,15 +411,15 @@ private static void HandleEnumGetName(MethodConvert methodConvert, SemanticModel

methodConvert.Drop(); // Remove the duplicated input value
methodConvert.Push(t.Name); // Push enum name
methodConvert.Ret(); // Return enum name
methodConvert.JumpAlways(endTarget);

nextCheck.Instruction = methodConvert.Nop();
}

// No match found
methodConvert.Drop(); // Remove the input value
methodConvert.PushNull(); // Push null (no matching enum name)
methodConvert.Ret(); // Return null
endTarget.Instruction = methodConvert.Nop();
}

/// <summary>
Expand Down Expand Up @@ -467,7 +467,7 @@ private static void HandleEnumGetNameWithType(MethodConvert methodConvert, Seman

var enumMembers = enumTypeSymbol.GetMembers().OfType<IFieldSymbol>()
.Where(field => field is { HasConstantValue: true, IsImplicitlyDeclared: false }).ToArray();

var endTarget = new JumpTarget();
var valueItem = methodConvert.PopInstruction(); // The second argument is the value to get the name of
var enumTypeItem = methodConvert.PopInstruction(); // The first argument is the enum type, It's unused when running
methodConvert.AddInstruction(valueItem);
Expand All @@ -481,15 +481,15 @@ private static void HandleEnumGetNameWithType(MethodConvert methodConvert, Seman

methodConvert.Drop(); // Remove the duplicated input value
methodConvert.Push(t.Name); // Push enum name
methodConvert.Ret(); // Return enum name
methodConvert.JumpAlways(endTarget);

nextCheck.Instruction = methodConvert.Nop();
}

// No match found
methodConvert.Drop(); // Remove the input value
methodConvert.PushNull(); // Push null (no matching enum name)
methodConvert.Ret(); // Return null
endTarget.Instruction = methodConvert.Nop();
}

/// <summary>
Expand Down Expand Up @@ -555,17 +555,17 @@ private static void HandleEnumTryParse(MethodConvert methodConvert, SemanticMode
methodConvert.JumpIfNot(nextCheck);

// If equal:
methodConvert.Drop(2); // Remove the inputString
methodConvert.Drop(2); // Remove the EnumType and inputString
methodConvert.Push(t.ConstantValue); // Stack: [..., enumValue]
methodConvert.AccessSlot(OpCode.STSFLD, index); // Store enum value in out parameter
methodConvert.Push(true); // Stack: [..., true]
methodConvert.Ret();
methodConvert.JumpAlways(endTarget);

nextCheck.Instruction = methodConvert.Nop();
}

// No match found
methodConvert.Drop(2); // Remove the inputString
methodConvert.Drop(2); // Remove the EumType and inputString
methodConvert.Push(0); // Default enum value
methodConvert.AccessSlot(OpCode.STSFLD, index); // Store default value in out parameter
methodConvert.Push(false); // Success flag set to false
Expand Down Expand Up @@ -623,8 +623,6 @@ private static void HandleEnumGetNames(MethodConvert methodConvert, SemanticMode
foreach (IFieldSymbol m in enumMembers.Reverse()) // PACK works in a reversed way
methodConvert.Push(m.Name);
methodConvert.Pack(enumMembers.Length);

methodConvert.Ret();
}

/// <summary>
Expand Down Expand Up @@ -677,8 +675,6 @@ private static void HandleEnumGetValues(MethodConvert methodConvert, SemanticMod
foreach (IFieldSymbol m in enumMembers.Reverse()) // PACK works in a reversed way
methodConvert.Push(m.ConstantValue);
methodConvert.Pack(enumMembers.Length);

methodConvert.Ret();
}

/// <summary>
Expand Down Expand Up @@ -733,7 +729,8 @@ private static void HandleEnumIsDefined(MethodConvert methodConvert, SemanticMod
var valueType = model.GetTypeInfo(argument.Expression).Type;

// We need to compare the input value against the enum values
var endLabel = new JumpTarget();
var endTarget = new JumpTarget();

// here add check logic to verify if valueType is string
var isName = valueType is INamedTypeSymbol { Name: "String" };

Expand All @@ -756,15 +753,14 @@ private static void HandleEnumIsDefined(MethodConvert methodConvert, SemanticMod
methodConvert.JumpIfNot(nextCheck);

// If equal, set result to true
methodConvert.Drop();
methodConvert.Drop(); // Remove the false
methodConvert.Drop(2); // Remove the EnumType and duplicated value
methodConvert.Push(true); // Set result to true
methodConvert.Ret();
methodConvert.JumpAlways(endTarget);
nextCheck.Instruction = methodConvert.Nop();
}
methodConvert.Drop();
methodConvert.Drop(); // Remove the duplicated value
methodConvert.Drop(2); // Remove the EnumType and duplicated value
methodConvert.Push(false);
endTarget.Instruction = methodConvert.Nop();
}

private static INamedTypeSymbol EnsureEnumTypeArgument(IMethodSymbol symbol, int index, SyntaxNode? errorNode)
Expand Down Expand Up @@ -794,7 +790,7 @@ private static void HandleEnumToString(MethodConvert methodConvert, SemanticMode
throw new CompilationException(symbol, DiagnosticId.InvalidType, "Enum.ToString is only supported on enum values.");

var enumMembers = GetEnumFields(enumType);

var endTarget = new JumpTarget();
foreach (var member in enumMembers)
{
methodConvert.Dup();
Expand All @@ -805,12 +801,13 @@ private static void HandleEnumToString(MethodConvert methodConvert, SemanticMode
methodConvert.JumpIfFalse(next);
methodConvert.Drop();
methodConvert.Push(member.Name);
methodConvert.Ret();
methodConvert.JumpAlways(endTarget);
next.Instruction = methodConvert.Nop();
}

// Fallback to numeric representation
methodConvert.CallContractMethod(NativeContract.StdLib.Hash, "itoa", 1, true);
endTarget.Instruction = methodConvert.Nop();
}

private static void HandleEnumHasFlag(MethodConvert methodConvert, SemanticModel model, IMethodSymbol symbol,
Expand Down Expand Up @@ -942,6 +939,7 @@ private static void HandleEnumTryParseGeneric(MethodConvert methodConvert, Seman

byte resultSlot = methodConvert.AddAnonymousVariable();
byte successSlot = methodConvert.AddAnonymousVariable();
var successTarget = new JumpTarget();

methodConvert.Push(0);
methodConvert.AccessSlot(OpCode.STLOC, resultSlot);
Expand All @@ -961,21 +959,16 @@ private static void HandleEnumTryParseGeneric(MethodConvert methodConvert, Seman
methodConvert.AccessSlot(OpCode.STLOC, resultSlot);
methodConvert.Push(true);
methodConvert.AccessSlot(OpCode.STLOC, successSlot);
JumpTarget end = new();
methodConvert.JumpAlways(end);
end.Instruction = methodConvert.Nop();
methodConvert.AccessSlot(OpCode.LDLOC, resultSlot);
methodConvert.AccessSlot(OpCode.STSFLD, index);
methodConvert.AccessSlot(OpCode.LDLOC, successSlot);
methodConvert.Ret();
methodConvert.JumpAlways(successTarget);

next.Instruction = methodConvert.Nop();
}

methodConvert.Drop();
successTarget.Instruction = methodConvert.Nop();
methodConvert.AccessSlot(OpCode.LDLOC, resultSlot);
methodConvert.AccessSlot(OpCode.STSFLD, index);
methodConvert.AccessSlot(OpCode.LDLOC, successSlot);
methodConvert.Ret();
}

private static void HandleEnumTryParseGenericIgnoreCase(MethodConvert methodConvert, SemanticModel model, IMethodSymbol symbol,
Expand Down Expand Up @@ -1004,7 +997,9 @@ private static void HandleEnumTryParseGenericIgnoreCase(MethodConvert methodConv
methodConvert.Push(false);
methodConvert.AccessSlot(OpCode.STLOC, successSlot);

JumpTarget skipUpper = new();
var skipUpper = new JumpTarget();
var successTarget = new JumpTarget();

methodConvert.AccessSlot(OpCode.LDLOC, ignoreSlot);
methodConvert.JumpIfFalse(skipUpper);
ConvertToUpper(methodConvert, preserveInput: true);
Expand All @@ -1031,21 +1026,16 @@ private static void HandleEnumTryParseGenericIgnoreCase(MethodConvert methodConv
methodConvert.AccessSlot(OpCode.STLOC, resultSlot);
methodConvert.Push(true);
methodConvert.AccessSlot(OpCode.STLOC, successSlot);
JumpTarget end = new();
methodConvert.JumpAlways(end);
end.Instruction = methodConvert.Nop();
methodConvert.AccessSlot(OpCode.LDLOC, resultSlot);
methodConvert.AccessSlot(OpCode.STSFLD, index);
methodConvert.AccessSlot(OpCode.LDLOC, successSlot);
methodConvert.Ret();
methodConvert.JumpAlways(successTarget);

next.Instruction = methodConvert.Nop();
}

methodConvert.Drop();
successTarget.Instruction = methodConvert.Nop();
methodConvert.AccessSlot(OpCode.LDLOC, resultSlot);
methodConvert.AccessSlot(OpCode.STSFLD, index);
methodConvert.AccessSlot(OpCode.LDLOC, successSlot);
methodConvert.Ret();
}

private static void HandleEnumGetValuesGeneric(MethodConvert methodConvert, SemanticModel model, IMethodSymbol symbol,
Expand All @@ -1058,7 +1048,6 @@ private static void HandleEnumGetValuesGeneric(MethodConvert methodConvert, Sema
methodConvert.Push(member.ConstantValue);

methodConvert.Pack(members.Length);
methodConvert.Ret();
}

private static void HandleEnumGetNamesGeneric(MethodConvert methodConvert, SemanticModel model, IMethodSymbol symbol,
Expand All @@ -1071,6 +1060,5 @@ private static void HandleEnumGetNamesGeneric(MethodConvert methodConvert, Seman
methodConvert.Push(member.Name);

methodConvert.Pack(members.Length);
methodConvert.Ret();
}
}
Loading
Loading