Use enum for frametype not v table #112166
Open
+1,286
−1,698
Conversation
This file contains 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
…ize, and make it reviewable
…s easier to search for
…ForFrametypeNotVTable
|
Tagging subscribers to this area: @mangod9 |
jkotas
reviewed
Feb 5, 2025
…ForFrametypeNotVTable
…ForFrametypeNotVTable
davidwrighton
changed the title
jkotas
reviewed
Feb 7, 2025
max-charlamb
reviewed
Feb 7, 2025
jkotas
reviewed
Feb 7, 2025
jkotas
approved these changes
Feb 8, 2025
src/coreclr/vm/frames.cpp
Outdated
| @@ -269,77 +512,30 @@ void Frame::LogFrameChain( | |||
|
|
|||
| #ifndef DACCESS_COMPILE | |||
|
|
|||
| // This hashtable contains the vtable value of every Frame type. | |||
| static PtrHashMap* s_pFrameVTables = NULL; | |||
|
|
|||
| // static | |||
src/coreclr/vm/frames.cpp
Outdated
| @@ -198,19 +445,19 @@ const size_t FRAME_TYPES_COUNT = | |||
| //----------------------------------------------------------------------- | |||
| // Implementation of the global table of names. On the DAC side, just the global pointer. | |||
| // On the runtime side, the array of names. | |||
| #define FRAME_TYPE_NAME(x) {x::GetMethodFrameVPtr(), #x} , | |||
| #define FRAME_TYPE_NAME(x) {FrameIdentifier::x, #x} , | |||
There was a problem hiding this comment.
FrameIdentifier does not need to be in the table anymore. We can just index into the table.
| @@ -198,19 +445,19 @@ const size_t FRAME_TYPES_COUNT = | |||
| //----------------------------------------------------------------------- | |||
There was a problem hiding this comment.
FRAME_TYPES_COUNT above can be deleted
src/coreclr/vm/frames.cpp
Outdated
| } // void Frame::Init() | ||
|
|
||
| #endif // DACCESS_COMPILE | ||
|
|
||
| // Returns true if the Frame's VTablePtr is valid | ||
|
|
||
| // static | ||
| bool Frame::HasValidVTablePtr(Frame * pFrame) | ||
| bool Frame::HasFrameIdentifier(Frame * pFrame) |
There was a problem hiding this comment.
Suggested change
| bool Frame::HasFrameIdentifier(Frame * pFrame) | |
| bool Frame::HasValidFrameIdentifier(Frame * pFrame) |
?
jkotas
reviewed
Feb 8, 2025
src/coreclr/vm/frames.cpp
Outdated
| #include "frames.h" | ||
|
|
||
| LIMITED_METHOD_CONTRACT; | ||
| _frameIdentifier = frameIdentifier; | ||
| } // void Frame::Init() | ||
|
|
||
| #endif // DACCESS_COMPILE | ||
|
|
||
| // Returns true if the Frame's VTablePtr is valid |
There was a problem hiding this comment.
Suggested change
| // Returns true if the Frame's VTablePtr is valid | |
| // Returns true if the Frame has a valid FrameIdentifier |
jkotas
reviewed
Feb 8, 2025
src/coreclr/vm/frames.cpp
Outdated
|
|
||
| void Frame::GcScanRoots(promote_func *fn, ScanContext* sc) | ||
| { | ||
| switch (this->GetFrameIdentifier()) |
There was a problem hiding this comment.
Suggested change
| switch (this->GetFrameIdentifier()) | |
| switch (GetFrameIdentifier()) |
Nit: this-> should not be needed
jkotas
reviewed
Feb 8, 2025
| FRAME_POLYMORPHIC_DISPATCH_UNREACHABLE(); | ||
| return NULL; | ||
| } | ||
| } |
jkotas
reviewed
Feb 8, 2025
src/coreclr/vm/frames.cpp
Outdated
Comment on lines
83
to
84
|
|
||
| #endif |
jkotas
reviewed
Feb 8, 2025
src/coreclr/vm/frames.cpp
Outdated
| } | ||
| } | ||
|
|
||
|
|
35 tasks
|
Resolves #111875 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Frames are currently identified by VTable, which is convenient for writing C++ code, but less so for writing asm, or out of process inspection. This change changes that to a
FrameIdentifierenum, make the polymorphic dispatch occur using if statements, and removes GS cookies for Frame's as we no longer need to protect the vtable.