Skip to content

fix: eliminate unnecessary string copies in EmitDeref and GetOrMaterialize #75

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

Closed
Copilot wants to merge 1 commit into from
Closed

fix: eliminate unnecessary string copies in EmitDeref and GetOrMaterialize #75

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
14 changes: 7 additions & 7 deletions cpp2rust/converter/converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2321,7 +2321,7 @@ bool Converter::VisitDeclRefExpr(clang::DeclRefExpr *expr) {

if (decl->getType()->getAs<clang::ReferenceType>() && !isAddrOf() &&
!map_iter_decls_.contains(clang::dyn_cast<clang::VarDecl>(decl))) {
EmitDeref(std::move(str), decl->getType().getNonReferenceType());
EmitDeref(str, decl->getType().getNonReferenceType());
SetValueFreshness(expr->getType());
return false;
}
Expand Down Expand Up @@ -2464,7 +2464,7 @@ bool Converter::VisitMemberExpr(clang::MemberExpr *expr) {
}

if (!isAddrOf() && member->getType()->isReferenceType()) {
EmitDeref(std::move(str), member->getType().getNonReferenceType());
EmitDeref(str, member->getType().getNonReferenceType());
return false;
}

Expand Down Expand Up @@ -3561,14 +3561,14 @@ void Converter::ConvertAddrOf(clang::Expr *expr, clang::QualType pointer_type) {
}
}

void Converter::EmitDeref(std::string inner, clang::QualType pointee_type) {
void Converter::EmitDeref(std::string_view inner, clang::QualType pointee_type) {
auto wrap = std::exchange(autoref_mut_, std::nullopt);
PushParen outer(*this, wrap.has_value());
if (wrap) {
StrCat(*wrap ? "&mut" : "&");
}
PushParen paren(*this);
StrCat(GetPointerDerefPrefix(pointee_type), std::move(inner));
StrCat(GetPointerDerefPrefix(pointee_type), inner);
}

void Converter::ConvertDeref(clang::Expr *expr) {
Expand Down Expand Up @@ -3605,9 +3605,9 @@ Converter::CollectPrvalueToLRefArgs(clang::CallExpr *expr) {

const std::string &Converter::TempMaterializationCtx::GetOrMaterialize(
unsigned argument_num,
std::function<std::pair<std::string, std::string>(const std::string &,
clang::QualType)>
materialize_fn) {
const std::function<std::pair<std::string, std::string>(const std::string &,
clang::QualType)>
&materialize_fn) {
auto &str = materialized_refs_.at(argument_num);
if (!str.empty()) {
return str;
Expand Down
7 changes: 3 additions & 4 deletions cpp2rust/converter/converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {

const std::string &GetOrMaterialize(
unsigned argument_num,
std::function<std::pair<std::string, std::string>(const std::string &,
clang::QualType)>
materialize_fn);
const std::function<std::pair<std::string, std::string>(
const std::string &, clang::QualType)> &materialize_fn);

private:
std::vector<std::string> materialized_refs_;
Expand Down Expand Up @@ -476,7 +475,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {

virtual void ConvertDeref(clang::Expr *expr);

void EmitDeref(std::string inner, clang::QualType pointee_type);
void EmitDeref(std::string_view inner, clang::QualType pointee_type);

virtual void ConvertArrow(clang::Expr *expr);

Expand Down
Loading