[hot_reload] Fix unresolved token when new nested structs are used#76618

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
lambdageek merged 2 commits into from
Oct 5, 2022
Merged

[hot_reload] Fix unresolved token when new nested structs are used #76618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d2d4ee
[test] Calling the ctor of a class with a nested struct
lambdageek Oct 4, 2022
894cb89
Don't resolve the types of added fields too early
lambdageek Oct 4, 2022
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 .../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
public event EventHandler<string> E;
public void R() { E(this,"123"); }
}

public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down
27 changes: 27 additions & 0 deletions ...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
public static DateTime NewStaticField;

public static double NewProp { get; set; }

public static void ExistingMethod ()
{
// modified
NewStaticField2 = new AnotherAddedClass();
}

public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
Red, Yellow, Green
}

public class AnotherAddedClass
{
public struct NewNestedStruct
{
public double D;
public object O;
}

public NewNestedStruct S;

public AnotherAddedClass()
{
S = new NewNestedStruct {
D = 1234.0,
O = "1234",
};
}
}
2 changes: 2 additions & 0 deletions src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

Assert.Equal("123", i.ItfMethod(123));

System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
});
}
}
Expand Down
22 changes: 13 additions & 9 deletions src/mono/mono/component/hot_reload.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

/* This actually does more than mono_class_setup_basic_field_info and
* resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
* it easier to spot that the field is special.
/* This actually does slightly more than
* mono_class_setup_basic_field_info and sets MonoClassField:offset
* to -1 to make it easier to spot that the field is special.
*/
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
if (!is_ok (error)) {
mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
if (!m_class_is_inited (parent_klass))
mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
field->field.name = mono_metadata_string_heap (image_base, name_idx);

mono_field_resolve_type (&field->field, error);
if (!is_ok (error))
return NULL;
/* It's important not to try and resolve field->type at this point. If the field's type is a
* newly-added struct, we don't want to resolve it early here if we're going to add fields
* and methods to it. It seems that for nested structs, the field additions come after the
* field addition to the enclosing struct. So if the enclosing struct has a field of the
* nested type, resolving the field type here will make it look like the nested struct has
* no fields.
*/

parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down
10 changes: 8 additions & 2 deletions src/mono/mono/metadata/class.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
/* Fields in metadata updates are pre-resolved, so this method should not be called. */
g_assert (!m_field_is_from_update (field));
if (G_UNLIKELY (m_field_is_from_update (field))) {
/* metadata-update: Just resolve the whole field, for simplicity. */
ERROR_DECL (error);
mono_field_resolve_type (field, error);
mono_error_assert_ok (error);
g_assert (field->type);
return field->type->attrs;
}

MonoClass *klass = m_field_get_parent (field);
MonoImage *image = m_class_get_image (klass);
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" + '

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
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('^' + ".*" + '

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
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('^' + ".*" + '

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
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" + '

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
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('^' + ".*" + '

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
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('^' + ".*" + '

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
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); }
})();
})();

Skip to content
[hot_reload] Fix unresolved token when new nested structs are used#76618

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

lambdageek
merged 2 commits into

from

Oct 5, 2022
 Merged


[hot_reload] Fix unresolved token when new nested structs are used
#76618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


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

[test] Calling the ctor of a class with a nested struct


lambdageek Oct 4, 2022
894cb89

Don't resolve the types of added fields too early


lambdageek Oct 4, 2022

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
.../System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class PreviousNestedClass {
 public event EventHandler<string> E;
 public void R() { E(this,"123"); }
 }

 public static void ExistingMethod () {}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand Down

27 changes: 27 additions & 0 deletions
...stem.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType/ReflectionAddNewType_v1.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,14 @@ public class NewNestedClass {};
 public static DateTime NewStaticField;

 public static double NewProp { get; set; }

 public static void ExistingMethod ()
 {
 // modified
 NewStaticField2 = new AnotherAddedClass();
 }

 public static AnotherAddedClass NewStaticField2;
}

[AttributeUsage(AttributeTargets.All, AllowMultiple=true, Inherited=false)]
Expand DownExpand Up@@ -87,3 +95,22 @@ public interface INewInterface : IExistingInterface {
public enum NewEnum {
 Red, Yellow, Green
}

public class AnotherAddedClass
{
 public struct NewNestedStruct
 {
 public double D;
 public object O;
 }

 public NewNestedStruct S;

 public AnotherAddedClass()
 {
 S = new NewNestedStruct {
 D = 1234.0,
 O = "1234",
 };
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -625,6 +625,8 @@ public static void TestReflectionAddNewType()
 var i = (System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.IExistingInterface)o;

 Assert.Equal("123", i.ItfMethod(123));

 System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.ZExistingClass.ExistingMethod ();
 });
 }
 }
Expand Down

22 changes: 13 additions & 9 deletions
src/mono/mono/component/hot_reload.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ static const char *
hot_reload_get_capabilities (void);

static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error);
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags);

static MonoComponentHotReload fn_table = {
	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_available },
Expand DownExpand Up@@ -2189,11 +2189,11 @@ apply_enclog_pass2 (Pass2Context *ctx, MonoImage *image_base, BaselineInfo *base

 add_field_to_baseline (base_info, delta_info, add_member_klass, log_token);

 /* This actually does more than mono_class_setup_basic_field_info and
 * resolves MonoClassField:type and sets MonoClassField:offset to -1 to make
 * it easier to spot that the field is special.
 /* This actually does slightly more than
 * mono_class_setup_basic_field_info and sets MonoClassField:offset
 * to -1 to make it easier to spot that the field is special.
 */
metadata_update_field_setup_basic_info_and_resolve (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags, error);
metadata_update_field_setup_basic_info (image_base, base_info, generation, delta_info, add_member_klass, log_token, field_flags);
 if (!is_ok (error)) {
 mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_METADATA_UPDATE, "Could not setup field (token 0x%08x) due to: %s", log_token, mono_error_get_message (error));
 return FALSE;
Expand DownExpand Up@@ -2884,7 +2884,7 @@ hot_reload_get_field (MonoClass *klass, uint32_t fielddef_token) {


static MonoClassMetadataUpdateField *
metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags, MonoError *error)
metadata_update_field_setup_basic_info (MonoImage *image_base, BaselineInfo *base_info, uint32_t generation, DeltaInfo *delta_info, MonoClass *parent_klass, uint32_t fielddef_token, uint32_t field_flags)
{
	if (!m_class_is_inited (parent_klass))
 mono_class_init_internal (parent_klass);
Expand All@@ -2903,9 +2903,13 @@ metadata_update_field_setup_basic_info_and_resolve (MonoImage *image_base, Basel
	uint32_t name_idx = mono_metadata_decode_table_row_col (image_base, MONO_TABLE_FIELD, mono_metadata_token_index (fielddef_token) - 1, MONO_FIELD_NAME);
	field->field.name = mono_metadata_string_heap (image_base, name_idx);

	mono_field_resolve_type (&field->field, error);
	if (!is_ok (error))
 return NULL;
	/* It's important not to try and resolve field->type at this point. If the field's type is a
 * newly-added struct, we don't want to resolve it early here if we're going to add fields
 * and methods to it. It seems that for nested structs, the field additions come after the
 * field addition to the enclosing struct. So if the enclosing struct has a field of the
 * nested type, resolving the field type here will make it look like the nested struct has
 * no fields.
 */

	parent_info->added_fields = g_slist_prepend_mem_manager (m_class_get_mem_manager (parent_klass), parent_info->added_fields, field);

Expand Down

10 changes: 8 additions & 2 deletions
src/mono/mono/metadata/class.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6604,8 +6604,14 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
static guint32
mono_field_resolve_flags (MonoClassField *field)
{
	/* Fields in metadata updates are pre-resolved, so this method should not be called. */
	g_assert (!m_field_is_from_update (field));
	if (G_UNLIKELY (m_field_is_from_update (field))) {
 /* metadata-update: Just resolve the whole field, for simplicity. */
 ERROR_DECL (error);
 mono_field_resolve_type (field, error);
 mono_error_assert_ok (error);
 g_assert (field->type);
 return field->type->attrs;
 }

	MonoClass *klass = m_field_get_parent (field);
	MonoImage *image = m_class_get_image (klass);
Expand Down