Skip to content

Commit f58974a

Browse files
authored
Ignore conflicts with decls that are not generated (#1925)
* Ignore conflicts with decls that are not generated * Fix build error in test
1 parent 70407a4 commit f58974a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/Generator/Passes/RenamePass.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ where typedefDecl.Type.Desugar() is FunctionType
181181
declarations.AddRange(@class.TemplateParameters);
182182
}
183183

184+
declarations.RemoveAll(d => !d.IsGenerated);
185+
184186
var existing = declarations.Find(d => d != decl && d.Name == newName);
185187
if (existing != null)
186188
return CheckExisting(decl, existing);

tests/dotnet/Common/Common.Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ public void TestNonTrivialDtorInvocation()
899899
using (var nonTrivialDtor = new NonTrivialDtor())
900900
{
901901
}
902-
Assert.IsTrue(NonTrivialDtor.dtorCalled);
902+
Assert.IsTrue(NonTrivialDtor.DtorCalled);
903903
}
904904

905905
[Test]

0 commit comments

Comments
 (0)