Skip to content

[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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
carlossanlop merged 5 commits into from
Aug 23, 2023
Merged

[release/8.0] [mono] Initialize module's image ALC for dynamic objects #90912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6aea7e6
Use the image's ALC instead of the default one if exists
kotlarmilos Aug 17, 2023
f8b880b
Init module's image ALC
kotlarmilos Aug 18, 2023
6aa32b2
Add runtime test for dynamic objects
kotlarmilos Aug 18, 2023
1016253
Fix lint
kotlarmilos Aug 18, 2023
9b2677c
Disable test on platforms that don't support dynamic code generation
kotlarmilos Aug 18, 2023
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
2 changes: 2 additions & 0 deletions src/mono/mono/metadata/sre.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
* determined at assembly save time.
*/
/*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
MonoAssemblyLoadContext *alc = mono_alc_get_default ();
MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
char *name = mono_string_handle_to_utf8 (abname, error);
return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
}
MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
image->image.alc = alc;

MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down
107 changes: 107 additions & 0 deletions src/tests/Loader/CustomAttributes/DynamicObjects.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
public class M {
public const string ObjectRequiredMessage = "some string";
public static int Main() {
var instance = createObject();
var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

Assert.True(attrs.Count() == 2);
Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

Console.WriteLine("Success");
return 100;
}

public static object createObject () {
var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
var tb = moduleBuilder.DefineType("namespace.myclass"
, TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit
, typeof(object));

FieldBuilder fb = tb.DefineField("_prop1",
typeof(string),
FieldAttributes.Private);

var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
MethodAttributes getSetAttr =
MethodAttributes.Public | MethodAttributes.SpecialName |
MethodAttributes.HideBySig;

// Define the "get" accessor method for prop1.
MethodBuilder custNameGetPropMthdBldr =
tb.DefineMethod("get_prop1",
getSetAttr,
typeof(string),
Type.EmptyTypes);

ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

custNameGetIL.Emit(OpCodes.Ldarg_0);
custNameGetIL.Emit(OpCodes.Ldfld, fb);
custNameGetIL.Emit(OpCodes.Ret);

// Define the "set" accessor method for prop1.
MethodBuilder custNameSetPropMthdBldr =
tb.DefineMethod("set_prop1",
getSetAttr,
null,
new Type[] { typeof(string) });

ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

custNameSetIL.Emit(OpCodes.Ldarg_0);
custNameSetIL.Emit(OpCodes.Ldarg_1);
custNameSetIL.Emit(OpCodes.Stfld, fb);
custNameSetIL.Emit(OpCodes.Ret);

// Last, we must map the two methods created above to our PropertyBuilder to
// their corresponding behaviors, "get" and "set" respectively.
pb.SetGetMethod(custNameGetPropMthdBldr);
pb.SetSetMethod(custNameSetPropMthdBldr);


///create display attribute
var dat = typeof(DisplayAttribute);
CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]),
new object[0],
new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))},
new object[] { "property 1"});
pb.SetCustomAttribute(CAB);

// //create required attribute
var rat = typeof(RequiredAttribute);
CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
new object[0],
new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
new object[] {typeof(ValidationErrors), "ObjectRequired" });
pb.SetCustomAttribute(CABR);

var objectType = tb.CreateType();
return Activator.CreateInstance(objectType);
}
}

public class ValidationErrors {
public static string ObjectRequired => M.ObjectRequiredMessage;
}

}
9 changes: 9 additions & 0 deletions src/tests/Loader/CustomAttributes/DynamicObjects.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions src/tests/issues.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

<!-- Requires Debug build -->
<ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

<ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
<Issue>Dynamic code generation is not supported on this platform</Issue>
</ExcludeList>
</ItemGroup>

<!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
<ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
<Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
<Issue>Dynamic code generation is not supported on this platform</Issue>
</ExcludeList>
</ItemGroup>

<ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[release/8.0] [mono] Initialize module's image ALC for dynamic objects by github-actions[bot] · Pull Request #90912 · dotnet/runtime · GitHub
Skip to content
[release/8.0] [mono] Initialize module's image ALC for dynamic objects#90912

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

carlossanlop
merged 5 commits into

from

Aug 23, 2023
 Merged


[release/8.0] [mono] Initialize module's image ALC for dynamic objects
#90912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6aea7e6

Use the image's ALC instead of the default one if exists


kotlarmilos Aug 17, 2023
f8b880b

Init module's image ALC


kotlarmilos Aug 18, 2023
6aa32b2

Add runtime test for dynamic objects


kotlarmilos Aug 18, 2023
1016253

Fix lint


kotlarmilos Aug 18, 2023
9b2677c

Disable test on platforms that don't support dynamic code generation


kotlarmilos Aug 18, 2023

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


2 changes: 2 additions & 0 deletions
src/mono/mono/metadata/sre.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1289,6 +1289,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 * determined at assembly save time.
 */
 /*image = (MonoDynamicImage*)ab->dynamic_assembly->assembly.image; */
 MonoAssemblyLoadContext *alc = mono_alc_get_default ();
 MonoStringHandle abname = MONO_HANDLE_NEW_GET (MonoString, ab, name);
 char *name = mono_string_handle_to_utf8 (abname, error);
 return_val_if_nok (error, FALSE);
Expand All@@ -1300,6 +1301,7 @@ image_module_basic_init (MonoReflectionModuleBuilderHandle moduleb, MonoError *e
 }
 MonoDynamicAssembly *dynamic_assembly = MONO_HANDLE_GETVAL (ab, dynamic_assembly);
 image = mono_dynamic_image_create (dynamic_assembly, name, fqname);
 image->image.alc = alc;

 MONO_HANDLE_SETVAL (MONO_HANDLE_CAST (MonoReflectionModule, moduleb), image, MonoImage*, &image->image);
 MONO_HANDLE_SETVAL (moduleb, dynamic_image, MonoDynamicImage*, image);
Expand Down

107 changes: 107 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
using System;
using System.Resources;
using System.Reflection;
using System.Reflection.Emit;
using System.ComponentModel.DataAnnotations;
using System.Linq;

using Xunit;

#nullable disable

namespace DynamicObjects {
 public class M {
 public const string ObjectRequiredMessage = "some string";
 public static int Main() {
 var instance = createObject();
 var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();

 Assert.True(attrs.Count() == 2);
 Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
 Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
 Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
 Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));

 Console.WriteLine("Success");
 return 100;
 }

 public static object createObject () {
 var an = new AssemblyName { Name = "TempAssembly" ,Version = new Version(1, 0, 0, 0) };
 var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);
 var moduleBuilder = assemblyBuilder.DefineDynamicModule("TempWorkflowAssembly.dll");
 var tb = moduleBuilder.DefineType("namespace.myclass"
 , TypeAttributes.Public |
 TypeAttributes.Class |
 TypeAttributes.AnsiClass |
 TypeAttributes.BeforeFieldInit
 , typeof(object));

 FieldBuilder fb = tb.DefineField("_prop1",
 typeof(string),
 FieldAttributes.Private);

 var pb = tb.DefineProperty("prop1", PropertyAttributes.HasDefault, typeof(string), null);
 MethodAttributes getSetAttr =
 MethodAttributes.Public | MethodAttributes.SpecialName |
 MethodAttributes.HideBySig;

 // Define the "get" accessor method for prop1.
 MethodBuilder custNameGetPropMthdBldr =
 tb.DefineMethod("get_prop1",
 getSetAttr,
 typeof(string),
 Type.EmptyTypes);

 ILGenerator custNameGetIL = custNameGetPropMthdBldr.GetILGenerator();

 custNameGetIL.Emit(OpCodes.Ldarg_0);
 custNameGetIL.Emit(OpCodes.Ldfld, fb);
 custNameGetIL.Emit(OpCodes.Ret);

 // Define the "set" accessor method for prop1.
 MethodBuilder custNameSetPropMthdBldr =
 tb.DefineMethod("set_prop1",
 getSetAttr,
 null,
 new Type[] { typeof(string) });

 ILGenerator custNameSetIL = custNameSetPropMthdBldr.GetILGenerator();

 custNameSetIL.Emit(OpCodes.Ldarg_0);
 custNameSetIL.Emit(OpCodes.Ldarg_1);
 custNameSetIL.Emit(OpCodes.Stfld, fb);
 custNameSetIL.Emit(OpCodes.Ret);

 // Last, we must map the two methods created above to our PropertyBuilder to
 // their corresponding behaviors, "get" and "set" respectively.
 pb.SetGetMethod(custNameGetPropMthdBldr);
 pb.SetSetMethod(custNameSetPropMthdBldr);


 ///create display attribute
 var dat = typeof(DisplayAttribute);
 CustomAttributeBuilder CAB = new CustomAttributeBuilder(dat.GetConstructor(new Type[0]), 
 new object[0],
 new PropertyInfo[1] { dat.GetProperty(nameof(DisplayAttribute.Name))}, 
 new object[] { "property 1"});
 pb.SetCustomAttribute(CAB);

 // //create required attribute
 var rat = typeof(RequiredAttribute);
 CustomAttributeBuilder CABR = new CustomAttributeBuilder(rat.GetConstructor(new Type[0]),
 new object[0],
 new PropertyInfo[2] { rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceType)),rat.GetProperty(nameof(RequiredAttribute.ErrorMessageResourceName))},
 new object[] {typeof(ValidationErrors), "ObjectRequired" });
 pb.SetCustomAttribute(CABR);

 var objectType = tb.CreateType();
 return Activator.CreateInstance(objectType);
 }
 }

 public class ValidationErrors {
 public static string ObjectRequired => M.ObjectRequiredMessage; 
 }

}

9 changes: 9 additions & 0 deletions
src/tests/Loader/CustomAttributes/DynamicObjects.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>Exe</OutputType>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 </ItemGroup>
</Project>

7 changes: 7 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1177,6 +1177,10 @@

 <!-- Requires Debug build -->
 <ExcludeList Include="$(XunitTestBinBase)/JIT\Directed\debugging\poisoning\poison\*" />

 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand DownExpand Up@@ -3717,6 +3721,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
 <Issue>https://github.com/dotnet/runtime/issues/90012</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
 <Issue>Dynamic code generation is not supported on this platform</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetArchitecture)' == 'wasm' or '$(TargetsMobile)' == 'true'">
Expand Down