diff options
| author | Amy Yu <amycmyu@gmail.com> | 2018-06-07 11:53:18 -0700 |
|---|---|---|
| committer | Amy Yu <amycmyu@gmail.com> | 2018-06-19 13:26:01 -0700 |
| commit | 2cf151572ab9df6b40faad4fdcecd30d7b8d6f7c (patch) | |
| tree | b2a70708755e542a4129d0bbccb061db3400eafd /src/tools | |
| parent | 957c4db6eb24cdbe87fcd02a658ab99b50f8d304 (diff) | |
| download | coreclr-2cf151572ab9df6b40faad4fdcecd30d7b8d6f7c.tar.gz coreclr-2cf151572ab9df6b40faad4fdcecd30d7b8d6f7c.tar.bz2 coreclr-2cf151572ab9df6b40faad4fdcecd30d7b8d6f7c.zip | |
Use GetEntryPointIdFromOffset to get EntryPointId of generic methods
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/r2rdump/DisassemblingTypeProvider.cs | 2 | ||||
| -rw-r--r-- | src/tools/r2rdump/R2RReader.cs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/r2rdump/DisassemblingTypeProvider.cs b/src/tools/r2rdump/DisassemblingTypeProvider.cs index c0a7e148c1..46db0feab8 100644 --- a/src/tools/r2rdump/DisassemblingTypeProvider.cs +++ b/src/tools/r2rdump/DisassemblingTypeProvider.cs @@ -43,7 +43,7 @@ namespace R2RDump if ((definition.Attributes & TypeAttributes.NestedPublic) != 0 || (definition.Attributes & TypeAttributes.NestedFamily) != 0) { TypeDefinitionHandle declaringTypeHandle = definition.GetDeclaringType(); - return GetTypeFromDefinition(reader, declaringTypeHandle, 0) + "/" + name; + return GetTypeFromDefinition(reader, declaringTypeHandle, 0) + "." + name; } return name; diff --git a/src/tools/r2rdump/R2RReader.cs b/src/tools/r2rdump/R2RReader.cs index 6017644a1e..dab31eaa53 100644 --- a/src/tools/r2rdump/R2RReader.cs +++ b/src/tools/r2rdump/R2RReader.cs @@ -202,9 +202,8 @@ namespace R2RDump } } - uint id = curParser.GetUnsigned(); - id = id >> 1; - R2RMethod method = new R2RMethod(_mdReader, rid, (int)id, args, tokens); + int id = GetEntryPointIdFromOffset((int)curParser.Offset); + R2RMethod method = new R2RMethod(_mdReader, rid, id, args, tokens); if (method.EntryPointRuntimeFunctionId >= 0 && method.EntryPointRuntimeFunctionId < isEntryPoint.Length) { isEntryPoint[method.EntryPointRuntimeFunctionId] = true; |