Skip to content

use kUnsetDebugHandle for unset debug handle in etdump delegation log #9754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gasoonjia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use kUnsetDebugHandle for unset debug handle in etdump delegation log #9754

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion devtools/etdump/etdump_flatcc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,21 @@ void ETDumpGen::log_intermediate_output_delegate_helper(
const char* name,
DebugHandle delegate_debug_index,
const T& output) {
// Previously we compared delegate_debug_index to -1 to check if it is set,
// but this is not a good solution because delegate_debug_index is of
// DebugHandle type which is a uint32_t. Also we have a specific value for
// runtime::kUnsetDebugHandle to represent an unset debug handle.
//
// To maintain backward compatibility:
// 1. We keep the comparison with -1 (cast to DebugHandle)
// 2. We add comparison with runtime::kUnsetDebugHandle
//
// TODO(gasoonjia): In the future, we should remove the comparison with -1 and
// only compare with runtime::kUnsetDebugHandle.
ET_CHECK_MSG(
(name == nullptr) ^ (delegate_debug_index == -1),
(name == nullptr) ^
(delegate_debug_index == runtime::kUnsetDebugHandle ||
delegate_debug_index == static_cast<DebugHandle>(-1)),
"Only name or delegate_debug_index can be valid. Check DelegateMappingBuilder documentation for more details.");

check_ready_to_add_events();
Expand Down
Loading