Initial step for adding AssemblyBuilder.Save implementation

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/RuntimeAssemblyBuilder.cs

@@ -183,8 +183,13 @@ internal static RuntimeAssemblyBuilder InternalDefineDynamicAssembly(
         /// modules within an Assembly with the same name. This dynamic module is
         /// a transient module.
         /// </summary>
-        protected override ModuleBuilder DefineDynamicModuleCore(string _)
+        protected override ModuleBuilder DefineDynamicModuleCore(string name)
         {
+            if (name[0] == '\0')
+            {
+                throw new ArgumentException(SR.Argument_InvalidName, nameof(name));
+            }
+
             lock (SyncRoot)
             {
                 // Create the dynamic module- only one ModuleBuilder per AssemblyBuilder can be created.

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/RuntimeFieldBuilder.cs

@@ -20,13 +20,9 @@ internal sealed class RuntimeFieldBuilder : FieldBuilder
         internal RuntimeFieldBuilder(RuntimeTypeBuilder typeBuilder, string fieldName, Type type,
             Type[]? requiredCustomModifiers, Type[]? optionalCustomModifiers, FieldAttributes attributes)
         {
-            ArgumentException.ThrowIfNullOrEmpty(fieldName);
-
             if (fieldName[0] == '\0')
                 throw new ArgumentException(SR.Argument_IllegalName, nameof(fieldName));
 
-            ArgumentNullException.ThrowIfNull(type);
-
             if (type == typeof(void))
                 throw new ArgumentException(SR.Argument_BadFieldType);
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/RuntimeTypeBuilder.cs

@@ -472,24 +472,22 @@ private RuntimeTypeBuilder(string szName, int genParamPos, RuntimeTypeBuilder de
         }
 
         internal RuntimeTypeBuilder(
-            string fullname, TypeAttributes attr, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, Type[]? interfaces, RuntimeModuleBuilder module,
+            string name, TypeAttributes attr, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, Type[]? interfaces, RuntimeModuleBuilder module,
             PackingSize iPackingSize, int iTypeSize, RuntimeTypeBuilder? enclosingType)
         {
-            ArgumentException.ThrowIfNullOrEmpty(fullname);
+            if (name[0] == '\0')
+                throw new ArgumentException(SR.Argument_IllegalName, nameof(name));
 
-            if (fullname[0] == '\0')
-                throw new ArgumentException(SR.Argument_IllegalName, nameof(fullname));
-
-            if (fullname.Length > 1023)
-                throw new ArgumentException(SR.Argument_TypeNameTooLong, nameof(fullname));
+            if (name.Length > 1023)
+                throw new ArgumentException(SR.Argument_TypeNameTooLong, nameof(name));
 
             int i;
             m_module = module;
             m_DeclaringType = enclosingType;
             RuntimeAssemblyBuilder containingAssem = m_module.ContainingAssemblyBuilder;
 
             // cannot have two types within the same assembly of the same name
-            containingAssem.CheckTypeNameConflict(fullname, enclosingType);
+            containingAssem.CheckTypeNameConflict(name, enclosingType);
 
             if (enclosingType != null)
             {
@@ -514,18 +512,18 @@ internal RuntimeTypeBuilder(
                 }
             }
 
-            int iLast = fullname.LastIndexOf('.');
+            int iLast = name.LastIndexOf('.');
             if (iLast <= 0)
             {
                 // no name space
                 m_strNameSpace = string.Empty;
-                m_strName = fullname;
+                m_strName = name;
             }
             else
             {
                 // split the name space
-                m_strNameSpace = fullname.Substring(0, iLast);
-                m_strName = fullname.Substring(iLast + 1);
+                m_strNameSpace = name.Substring(0, iLast);
+                m_strName = name.Substring(iLast + 1);
             }
 
             VerifyTypeAttributes(attr);
@@ -550,7 +548,7 @@ internal RuntimeTypeBuilder(
             }
 
             m_tdType = DefineType(new QCallModule(ref module),
-                fullname, tkParent, m_iAttr, tkEnclosingType, interfaceTokens!);
+                name, tkParent, m_iAttr, tkEnclosingType, interfaceTokens!);
 
             m_iPackingSize = iPackingSize;
             m_iTypeSize = iTypeSize;
@@ -1558,6 +1556,11 @@ protected override PropertyBuilder DefinePropertyCore(string name, PropertyAttri
 
         protected override EventBuilder DefineEventCore(string name, EventAttributes attributes, Type eventtype)
         {
+            if (name[0] == '\0')
+            {
+                throw new ArgumentException(SR.Argument_IllegalName, nameof(name));
+            }
+
             lock (SyncRoot)
             {
                 int tkType;

src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs

@@ -17,11 +17,6 @@ public ModuleBuilder DefineDynamicModule(string name)
         {
             ArgumentException.ThrowIfNullOrEmpty(name);
 
-            if (name[0] == '\0')
-            {
-                throw new ArgumentException(SR.Argument_InvalidName, nameof(name));
-            }
-
             return DefineDynamicModuleCore(name);
         }
 

src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

@@ -18,7 +18,11 @@ public void CreateGlobalFunctions()
         protected abstract void CreateGlobalFunctionsCore();
 
         public EnumBuilder DefineEnum(string name, TypeAttributes visibility, Type underlyingType)
-            => DefineEnumCore(name, visibility, underlyingType);
+        {
+            ArgumentException.ThrowIfNullOrEmpty(name);
+
+            return DefineEnumCore(name, visibility, underlyingType);
+        }
 
         protected abstract EnumBuilder DefineEnumCore(string name, TypeAttributes visibility, Type underlyingType);
 
@@ -80,7 +84,11 @@ public TypeBuilder DefineType(string name, TypeAttributes attr,
 
         public TypeBuilder DefineType(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, Type[]? interfaces)
-                => DefineTypeCore(name, attr, parent, interfaces, PackingSize.Unspecified, TypeBuilder.UnspecifiedTypeSize);
+        {
+            ArgumentException.ThrowIfNullOrEmpty(name);
+
+            return DefineTypeCore(name, attr, parent, interfaces, PackingSize.Unspecified, TypeBuilder.UnspecifiedTypeSize);
+        }
 
         public TypeBuilder DefineType(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, int typesize)
@@ -92,7 +100,11 @@ public TypeBuilder DefineType(string name, TypeAttributes attr,
 
         public TypeBuilder DefineType(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, PackingSize packingSize, int typesize)
-                => DefineTypeCore(name, attr, parent, null, packingSize, typesize);
+        {
+            ArgumentException.ThrowIfNullOrEmpty(name);
+
+            return DefineTypeCore(name, attr, parent, null, packingSize, typesize);
+        }
 
         protected abstract TypeBuilder DefineTypeCore(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, Type[]? interfaces, PackingSize packingSize, int typesize);

src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/TypeBuilder.cs

@@ -63,9 +63,6 @@ public EventBuilder DefineEvent(string name, EventAttributes attributes, Type ev
         {
             ArgumentException.ThrowIfNullOrEmpty(name);
 
-            if (name[0] == '\0')
-                throw new ArgumentException(SR.Argument_IllegalName, nameof(name));
-
             return DefineEventCore(name, attributes, eventtype);
         }
 
@@ -76,7 +73,12 @@ public FieldBuilder DefineField(string fieldName, Type type, FieldAttributes att
 
         public FieldBuilder DefineField(string fieldName, Type type, Type[]? requiredCustomModifiers, Type[]? optionalCustomModifiers,
             FieldAttributes attributes)
-                => DefineFieldCore(fieldName, type, requiredCustomModifiers, optionalCustomModifiers, attributes);
+        {
+            ArgumentException.ThrowIfNullOrEmpty(fieldName);
+            ArgumentNullException.ThrowIfNull(type);
+
+            return DefineFieldCore(fieldName, type, requiredCustomModifiers, optionalCustomModifiers, attributes);
+        }
 
         protected abstract FieldBuilder DefineFieldCore(string fieldName, Type type, Type[]? requiredCustomModifiers, Type[]? optionalCustomModifiers,
             FieldAttributes attributes);
@@ -159,7 +161,11 @@ public TypeBuilder DefineNestedType(string name, TypeAttributes attr,
 
         public TypeBuilder DefineNestedType(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, Type[]? interfaces)
-                => DefineNestedTypeCore(name, attr, parent, interfaces, PackingSize.Unspecified, UnspecifiedTypeSize);
+        {
+            ArgumentException.ThrowIfNullOrEmpty(name);
+
+            return DefineNestedTypeCore(name, attr, parent, interfaces, PackingSize.Unspecified, UnspecifiedTypeSize);
+        }
 
         protected abstract TypeBuilder DefineNestedTypeCore(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, Type[]? interfaces, PackingSize packSize, int typeSize);
@@ -174,7 +180,11 @@ public TypeBuilder DefineNestedType(string name, TypeAttributes attr,
 
         public TypeBuilder DefineNestedType(string name, TypeAttributes attr,
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? parent, PackingSize packSize, int typeSize)
-                => DefineNestedTypeCore(name, attr, parent, null, packSize, typeSize);
+        {
+            ArgumentException.ThrowIfNullOrEmpty(name);
+
+            return DefineNestedTypeCore(name, attr, parent, null, packSize, typeSize);
+        }
 
         [RequiresUnreferencedCode("P/Invoke marshalling may dynamically access members that could be trimmed.")]
         public MethodBuilder DefinePInvokeMethod(string name, string dllName, MethodAttributes attributes,