1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
commit edea3631e2c1cd49c93f6fff883fea2affdfa2d1
Author: Konstantin Zhuravlyov <kzhuravl_dev@outlook.com>
Date: Wed May 10 15:52:09 2023 -0400
Update getDesc* functions due to 689715fx
Change-Id: I0e8058ceb8a04550fe6c17d74babcf5fe0ee609d
diff --git a/src/comgr-metadata.cpp b/src/comgr-metadata.cpp
index a3375b4..72aeb01 100644
--- a/src/comgr-metadata.cpp
+++ b/src/comgr-metadata.cpp
@@ -223,7 +223,7 @@ static bool mergeNoteRecords(llvm::msgpack::DocNode &From,
template <class ELFT>
static bool processNote(const Elf_Note<ELFT> &Note, DataMeta *MetaP,
llvm::msgpack::DocNode &Root) {
- auto DescString = Note.getDescAsStringRef();
+ auto DescString = Note.getDescAsStringRef(4);
if (Note.getName() == "AMD" && Note.getType() == ELF::NT_AMD_HSA_METADATA) {
@@ -557,7 +557,7 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj,
switch (Note.getType()) {
case ELF::NT_AMD_HSA_CODE_OBJECT_VERSION: {
- if (Note.getDesc().size() <
+ if (Note.getDesc(4).size() <
sizeof(amdgpu_hsa_note_code_object_version_s)) {
IsError = true;
return true;
@@ -565,7 +565,7 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj,
const auto *NoteCodeObjectVersion =
reinterpret_cast<const amdgpu_hsa_note_code_object_version_s *>(
- Note.getDesc().data());
+ Note.getDesc(4).data());
// Only code objects up to version 2 used note records.
if (NoteCodeObjectVersion->major_version > 2) {
@@ -578,7 +578,7 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj,
}
case ELF::NT_AMD_HSA_HSAIL: {
- if (Note.getDesc().size() < sizeof(amdgpu_hsa_note_hsail_s)) {
+ if (Note.getDesc(4).size() < sizeof(amdgpu_hsa_note_hsail_s)) {
IsError = true;
return true;
}
@@ -588,21 +588,21 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj,
}
case ELF::NT_AMD_HSA_ISA_VERSION: {
- if (Note.getDesc().size() <
+ if (Note.getDesc(4).size() <
offsetof(amdgpu_hsa_note_isa_s, vendor_and_architecture_name)) {
IsError = true;
return true;
}
const auto *NoteIsa = reinterpret_cast<const amdgpu_hsa_note_isa_s *>(
- Note.getDesc().data());
+ Note.getDesc(4).data());
if (!NoteIsa->vendor_name_size || !NoteIsa->architecture_name_size) {
IsError = true;
return true;
}
- if (Note.getDesc().size() <
+ if (Note.getDesc(4).size() <
offsetof(amdgpu_hsa_note_isa_s, vendor_and_architecture_name) +
NoteIsa->vendor_name_size + NoteIsa->architecture_name_size) {
IsError = true;
|
