Generate valid C# for default params in specialisations

Signed-off-by: Dimitar Dobrev <[email protected]>
mono · Aug 29, 2021 · 4d4505e · 4d4505e
1 parent 0255eb7
commit 4d4505e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/Generator/Passes/HandleDefaultParamValuesPass.cs b/src/Generator/Passes/HandleDefaultParamValuesPass.cs
@@ -12,7 +12,7 @@ public class HandleDefaultParamValuesPass : TranslationUnitPass
             new Dictionary<DeclarationContext, List<Function>>();
 
         public HandleDefaultParamValuesPass()
-            => VisitOptions.ResetFlags(VisitFlags.ClassMethods);
+            => VisitOptions.ResetFlags(VisitFlags.ClassMethods | VisitFlags.ClassTemplateSpecializations);
 
         public override bool VisitTranslationUnit(TranslationUnit unit)
         {

diff --git a/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs b/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs
@@ -88,14 +88,6 @@ private static Method GetExtensionMethodForDependentPointer(Method specializedMe
             foreach (var parameter in extensionMethod.Parameters)
             {
                 var qualType = parameter.QualifiedType;
-                if (parameter.DefaultArgument != null)
-                {
-                    Type type = qualType.Type.Desugar(resolveTemplateSubstitution: false);
-                    type = (type.GetFinalPointee() ?? type).Desugar(
-                        resolveTemplateSubstitution: false);
-                    if (type is TemplateParameterSubstitutionType)
-                        parameter.DefaultArgument = null;
-                }
                 RemoveTemplateSubstitution(ref qualType);
                 parameter.QualifiedType = qualType;
             }

diff --git a/tests/CSharp/CSharpTemplates.h b/tests/CSharp/CSharpTemplates.h
@@ -119,6 +119,12 @@ T IndependentFields<T>::staticDependent(const T& t)
     return t;
 }
 
+template <typename T>
+template <typename AdditionalDependentType>
+void IndependentFields<T>::usesAdditionalDependentType(AdditionalDependentType additionalDependentType)
+{
+}
+
 template <typename T>
 float IndependentFields<T>::getIndependent()
 {
@@ -176,7 +182,7 @@ class DependentValueFields : public Base<T>
 };
 
 template <typename T>
-DependentValueFields<T>::DependentValueFields()
+DependentValueFields<T>::DependentValueFields() : unionField(0), dependentFunctionPointerField(0)
 {
 }
 
@@ -186,7 +192,7 @@ DependentValueFields<T>::~DependentValueFields()
 }
 
 template <typename T>
-DependentValueFields<T>::DependentValueFields(IndependentFields<T> i)
+DependentValueFields<T>::DependentValueFields(IndependentFields<T> i) : DependentValueFields()
 {
 }