Skip to content

Commit d04493b

Browse files
committed
merge main into amd-staging
[NFC][HeterogeneousDWARF] Remove MachineModuleInfo references Remove superfluous indirection through MMI member of MF to prepare for it being removed. CodeGen: Remove MachineModuleInfo reference from MachineFunction (llvm#100357) This avoids another unserializable field. Move the DbgInfoAvailable field into the AsmPrinter, which is only really a cache/convenience bit for checking a direct IR module metadata check. [Comgr] Updated expected error message for compile_log test Upstream updates to the ScriptLexer have modified the expected error message generated when linking the invalid file to a relocatable. Instead of an unexpected EOF, we now hit an unknown directive: llvm#100493 Change-Id: I315072967c4c6d1b94b3f6370bb59d4308efe238
2 parents 8952e47 + 8fc3294 commit d04493b

File tree

266 files changed

+9951
-4426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+9951
-4426
lines changed

amd/comgr/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ add_comgr_test(symbols_test c)
230230
add_comgr_test(symbols_iterate_test c)
231231
add_comgr_test(compile_test c)
232232
add_comgr_test(compile_minimal_test c)
233-
#broken by ScriptLexer: add_comgr_test(compile_log_test c)
233+
add_comgr_test(compile_log_test c)
234234
add_comgr_test(compile_log_remarks_test c)
235235
add_comgr_test(compile_device_libs_test c)
236236
add_comgr_test(compile_source_with_device_libs_to_bc_test c)

amd/comgr/test/compile_log_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ int main(int argc, char *argv[]) {
226226

227227
Status = amd_comgr_do_action(AMD_COMGR_ACTION_LINK_RELOCATABLE_TO_EXECUTABLE,
228228
DataAction, DataSetReloc, DataSetOut);
229-
checkLogs("LINK_RELOCATABLE_TO_EXECUTABLE", DataSetOut, "unexpected EOF");
229+
checkLogs("LINK_RELOCATABLE_TO_EXECUTABLE", DataSetOut, "unknown directive");
230230

231231
Status =
232232
amd_comgr_action_data_count(DataSetOut, AMD_COMGR_DATA_KIND_LOG, &Count);

0 commit comments

Comments
 (0)