Fix rebinding logic in MethodDef_Instance::InitializeFromIndex() #3221
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Instead of blindly rebing methodDef it now checks if that is required and goes through it's paces on finding the correct method in the correct assembly.
WalkthroughRefactored cross-assembly method resolution in CLR's type system. Renamed variable Changes
Sequence Diagram(s)sequenceDiagram
participant Caller
participant InitializeFromIndex as CLR_RT_MethodDef_Instance<br/>InitializeFromIndex()
participant OwnerAssembly as Owner Assembly
participant MethodDefTable as Original Assembly<br/>MethodDef Table
participant MethodRefTable as Target Assembly<br/>MethodRef Table
participant CrossRef as MethodRef<br/>Cross-Reference
Caller->>InitializeFromIndex: md, typeSpec
alt ownerAssembly != md.Assembly()
Note over InitializeFromIndex: Cross-assembly case
InitializeFromIndex->>OwnerAssembly: Locate original MethodDef
InitializeFromIndex->>MethodRefTable: Search by method name
alt MethodRef found
InitializeFromIndex->>CrossRef: Validate cross-ref target<br/>matches original
alt Cross-ref valid
InitializeFromIndex->>InitializeFromIndex: mdResolved = original method
else Cross-ref invalid
InitializeFromIndex->>InitializeFromIndex: mdResolved = md (fallback)
end
else MethodRef not found
InitializeFromIndex->>InitializeFromIndex: mdResolved = md (fallback)
end
else Same assembly
Note over InitializeFromIndex: Same-assembly case
InitializeFromIndex->>InitializeFromIndex: mdResolved = md
end
InitializeFromIndex->>InitializeFromIndex: InitializeFromIndex(mdResolved)
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes The change involves logic modifications to a core type system function with cross-assembly resolution semantics. Review requires understanding MethodRef lookup mechanics, assembly cross-references, and validating the fallback behavior for edge cases, but the change is localized to a single method. Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (2)
src/CLR/Core/TypeSystem.cpp (2)
1644-1644: Initialize mdResolved with md upfront.Avoid partial field assignment and make intent explicit.
- CLR_RT_MethodDef_Index mdResolved; + CLR_RT_MethodDef_Index mdResolved = md;
1664-1707: Cross-assembly scan is a no-op; remove or make it actually resolve.The loop only compares names and in all paths sets mdResolved.data = md.data, so behavior never changes while adding O(n) cost and confusion. Either delete the block and keep the original md, or implement signature-based resolution.
Minimal cleanup (recommended):
- // try to find the correct method reference - if (ownerTypeIdx.Assembly() != md.Assembly()) - { - // Cross-assembly case: need to find the corresponding MethodRef/MethodDef - CLR_RT_Assembly *originalAssm = g_CLR_RT_TypeSystem.m_assemblies[md.Assembly() - 1]; - CLR_RT_Assembly *targetAssm = g_CLR_RT_TypeSystem.m_assemblies[ownerTypeIdx.Assembly() - 1]; - - // Get the original method information - const CLR_RECORD_METHODDEF *originalMD = originalAssm->GetMethodDef(md.Method()); - const char *methodName = originalAssm->GetString(originalMD->name); - - // Try to find the method in the target assembly by looking through MethodRefs - bool found = false; - for (int i = 0; i < targetAssm->tablesSize[TBL_MethodRef]; i++) - { - const CLR_RECORD_METHODREF *mr = targetAssm->GetMethodRef(i); - const char *refName = targetAssm->GetString(mr->name); - - if (!strcmp(methodName, refName)) - { - // Found a potential match, now check if it resolves to our original method - CLR_RT_MethodRef_CrossReference &crossRef = targetAssm->crossReferenceMethodRef[i]; - - if (crossRef.target.data == md.data) - { - // This MethodRef points to our original method! - mdResolved.data = md.data; - found = true; - break; - } - } - } - - if (!found) - { - // Fallback: keep the original method reference - mdResolved.data = md.data; - } - } - else - { - // Same assembly case: no rebinding needed - mdResolved.data = md.data; - } + // No rebinding needed; keep original method index (rebinding caused issues previously).If you intended a real resolution, prefer matching by signature (name+signature) as done in ResolveMethodRef/FindMethodDef rather than name-only, and only rebind when a definitive match is found.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
src/CLR/Core/TypeSystem.cpp(2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (19)
- GitHub Check: nf-interpreter (Build_Azure_RTOS_targets SL_STK3701A)
- GitHub Check: nf-interpreter (Build_WIN32_nanoCLR)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_P4_UART)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_ETHERNET_KIT_1.2)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_S3_ALL)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_H2_THREAD)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_C6_THREAD)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_C3)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_BLE_REV0)
- GitHub Check: nf-interpreter (Build_STM32_targets ST_STM32F769I_DISCOVERY)
- GitHub Check: nf-interpreter (Build_STM32_targets ST_STM32F429I_DISCOVERY)
- GitHub Check: nf-interpreter (Build_NXP_targets NXP_MIMXRT1060_EVK)
- GitHub Check: nf-interpreter (Build_ESP32_targets ESP32_PSRAM_REV0)
- GitHub Check: nf-interpreter (Build_TI_SimpleLink_targets TI_CC1352R1_LAUNCHXL_915)
- GitHub Check: nf-interpreter (Nightly build) (Build_STM32_targets ORGPAL_PALX)
- GitHub Check: nf-interpreter (Nightly build) (Build_STM32_targets ORGPAL_PALTHREE)
- GitHub Check: nf-interpreter (Check_Code_Style)
- GitHub Check: nf-interpreter (Nightly build) (Check_Build_Options)
- GitHub Check: nf-interpreter (Check_Build_Options)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Motivation and Context
How Has This Been Tested?
[build with MDP buildId 57148]
Screenshots
Types of changes
Checklist
Summary by CodeRabbit