Skip to content

Update HandleProcNextFunction to accept a ConversionRecord instead of the individual members of the record. #3075

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

Merged
merged 1 commit into from
Sep 18, 2025
+15 −10
Merged

Update HandleProcNextFunction to accept a ConversionRecord instead of the individual members of the record. #3075

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions xls/dslx/ir_convert/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ cc_library(
deps = [
":channel_scope",
":conversion_info",
":conversion_record",
":convert_format_macro",
":convert_options",
":ir_conversion_utils",
Expand Down
12 changes: 9 additions & 3 deletions xls/dslx/ir_convert/function_converter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "xls/dslx/interp_value.h"
#include "xls/dslx/interp_value_utils.h"
#include "xls/dslx/ir_convert/channel_scope.h"
#include "xls/dslx/ir_convert/conversion_record.h"
#include "xls/dslx/ir_convert/convert_format_macro.h"
#include "xls/dslx/ir_convert/convert_options.h"
#include "xls/dslx/ir_convert/ir_conversion_utils.h"
Expand Down Expand Up @@ -3275,16 +3276,21 @@ absl::Status FunctionConverter::HandleChannelDecl(const ChannelDecl* node) {

// TODO: davidplass - break this method up. It's too big.
absl::Status FunctionConverter::HandleProcNextFunction(
Function* f, const Invocation* invocation, TypeInfo* type_info,
ImportData* import_data, const ParametricEnv* parametric_env,
const ProcId& proc_id, ProcConversionData* proc_data) {
const ConversionRecord& record, ImportData* import_data,
ProcConversionData* proc_data) {
TypeInfo* type_info = record.type_info();
XLS_RET_CHECK_NE(type_info, nullptr);

Function* f = record.f();
ProcId proc_id = record.proc_id().value();
VLOG(5) << "HandleProcNextFunction: " << f->ToString() << " proc id "
<< proc_id.ToString();
const Invocation* invocation = record.invocation();
if (invocation != nullptr) {
VLOG(5) << "HandleProcNextFunction: invocation " << invocation->ToString();
}

const ParametricEnv* parametric_env = &record.parametric_env();
if (parametric_env != nullptr) {
SetParametricEnv(parametric_env);
}
Expand Down
8 changes: 4 additions & 4 deletions xls/dslx/ir_convert/function_converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "xls/dslx/interp_value.h"
#include "xls/dslx/ir_convert/channel_scope.h"
#include "xls/dslx/ir_convert/conversion_info.h"
#include "xls/dslx/ir_convert/conversion_record.h"
#include "xls/dslx/ir_convert/convert_options.h"
#include "xls/dslx/ir_convert/proc_config_ir_converter.h"
#include "xls/dslx/ir_convert/proc_scoped_channel_scope.h"
Expand Down Expand Up @@ -149,10 +150,9 @@ class FunctionConverter {
absl::Status HandleFunction(Function* node, TypeInfo* type_info,
const ParametricEnv* parametric_env);

absl::Status HandleProcNextFunction(
Function* pf, const Invocation* invocation, TypeInfo* type_info,
ImportData* import_data, const ParametricEnv* parametric_env,
const ProcId& proc_id, ProcConversionData* proc_data);
absl::Status HandleProcNextFunction(const ConversionRecord& record,
ImportData* import_data,
ProcConversionData* proc_data);

// Notes a constant-definition dependency for the function (so it can
// participate in the IR conversion).
Expand Down
4 changes: 1 addition & 3 deletions xls/dslx/ir_convert/ir_converter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,7 @@ absl::Status ConvertOneFunctionInternal(PackageData& package_data,
proc_data->id_to_initial_value[record.proc_id().value()] = ir_value;
}

return converter.HandleProcNextFunction(
f, record.invocation(), record.type_info(), import_data,
&record.parametric_env(), record.proc_id().value(), proc_data);
return converter.HandleProcNextFunction(record, import_data, proc_data);
}

return converter.HandleFunction(f, record.type_info(),
Expand Down