Fix contructor attributes nullability in S.R.E.CustomAttributeBuilder (…

…#34556) * Fix contructor attributes nullability in S.R.E.CustomAttributeBuilder Fixes #819 * Finalise nullable * Updates ref
dotnet · Apr 6, 2020 · f0e5bcd · f0e5bcd
1 parent 9a58ab8
commit f0e5bcd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/CustomAttributeBuilder.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/CustomAttributeBuilder.cs
@@ -34,7 +34,7 @@ public CustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs)
         // public constructor to form the custom attribute with constructor, constructor
         // parameters and named properties.
         public CustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs,
-                                      PropertyInfo[] namedProperties, object[] propertyValues)
+                                      PropertyInfo[] namedProperties, object?[] propertyValues)
         {
             InitCustomAttributeBuilder(con, constructorArgs, namedProperties,
                                        propertyValues, Array.Empty<FieldInfo>(), Array.Empty<object>());
@@ -43,7 +43,7 @@ public CustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs,
         // public constructor to form the custom attribute with constructor and constructor
         // parameters.
         public CustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs,
-                                      FieldInfo[] namedFields, object[] fieldValues)
+                                      FieldInfo[] namedFields, object?[] fieldValues)
         {
             InitCustomAttributeBuilder(con, constructorArgs, Array.Empty<PropertyInfo>(),
                                        Array.Empty<object>(), namedFields, fieldValues);
@@ -52,8 +52,8 @@ public CustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs,
         // public constructor to form the custom attribute with constructor and constructor
         // parameters.
         public CustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs,
-                                      PropertyInfo[] namedProperties, object[] propertyValues,
-                                      FieldInfo[] namedFields, object[] fieldValues)
+                                      PropertyInfo[] namedProperties, object?[] propertyValues,
+                                      FieldInfo[] namedFields, object?[] fieldValues)
         {
             InitCustomAttributeBuilder(con, constructorArgs, namedProperties,
                                        propertyValues, namedFields, fieldValues);
@@ -97,8 +97,8 @@ private bool ValidateType(Type t)
         }
 
         internal void InitCustomAttributeBuilder(ConstructorInfo con, object?[] constructorArgs,
-                                                 PropertyInfo[] namedProperties, object[] propertyValues,
-                                                 FieldInfo[] namedFields, object[] fieldValues)
+                                                 PropertyInfo[] namedProperties, object?[] propertyValues,
+                                                 FieldInfo[] namedFields, object?[] fieldValues)
         {
             if (con == null)
                 throw new ArgumentNullException(nameof(con));
@@ -183,7 +183,7 @@ internal void InitCustomAttributeBuilder(ConstructorInfo con, object?[] construc
 
                 // Allow null for non-primitive types only.
                 Type propType = property.PropertyType;
-                object propertyValue = propertyValues[i];
+                object? propertyValue = propertyValues[i];
                 if (propertyValue == null && propType.IsValueType)
                     throw new ArgumentNullException("propertyValues[" + i + "]");
 
@@ -241,7 +241,7 @@ internal void InitCustomAttributeBuilder(ConstructorInfo con, object?[] construc
 
                 // Allow null for non-primitive types only.
                 Type fldType = namedField.FieldType;
-                object fieldValue = fieldValues[i];
+                object? fieldValue = fieldValues[i];
                 if (fieldValue == null && fldType.IsValueType)
                     throw new ArgumentNullException("fieldValues[" + i + "]");
 

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs
@@ -10,9 +10,9 @@ namespace System.Reflection.Emit
     public partial class CustomAttributeBuilder
     {
         public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs) { }
-        public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs, System.Reflection.FieldInfo[] namedFields, object[] fieldValues) { }
-        public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs, System.Reflection.PropertyInfo[] namedProperties, object[] propertyValues) { }
-        public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs, System.Reflection.PropertyInfo[] namedProperties, object[] propertyValues, System.Reflection.FieldInfo[] namedFields, object[] fieldValues) { }
+        public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs, System.Reflection.FieldInfo[] namedFields, object?[] fieldValues) { }
+        public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs, System.Reflection.PropertyInfo[] namedProperties, object?[] propertyValues) { }
+        public CustomAttributeBuilder(System.Reflection.ConstructorInfo con, object?[] constructorArgs, System.Reflection.PropertyInfo[] namedProperties, object?[] propertyValues, System.Reflection.FieldInfo[] namedFields, object?[] fieldValues) { }
     }
     public partial class ILGenerator
     {