Skip to content

Disable verbose logging by default #50

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
nunoplopes merged 5 commits into from
May 3, 2026
Merged

Disable verbose logging by default #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
916052b
Disable verbose logging by default
lucic71 May 1, 2026
844afc1
Add logging files
lucic71 May 1, 2026
6dc3f47
Don't use cpp2rust:: inside the cpp2rust namespace
lucic71 May 1, 2026
9222e5b
Remove vouts and keep errs for hard errors
lucic71 May 3, 2026
ce9c7a6
Dump expression before assert
lucic71 May 3, 2026
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
28 changes: 14 additions & 14 deletions cpp2rust/converter/converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ bool Converter::VisitBuiltinType(clang::BuiltinType *type) {
break;
default:
// FIXME: improve error handling
llvm::errs() << "unsupported builtin type\n";
log() << "unsupported builtin type\n";
break;
}
return false;
Expand Down Expand Up @@ -151,7 +151,7 @@ bool Converter::VisitRecordType(clang::RecordType *type) {
}

std::string Converter::ConvertPointer(clang::Expr *expr, int line) {
llvm::errs() << "ConvertPointer called from line " << line << "\n";
log() << "ConvertPointer called from line " << line << "\n";
PushExprKind push(*this, ExprKind::AddrOf);
return ToString(expr);
}
Expand All @@ -175,7 +175,7 @@ std::string Converter::ConvertLValue(clang::Expr *expr) {
}

std::string Converter::ConvertRValue(clang::Expr *expr, int line) {
llvm::errs() << "ConvertRValue called from line " << line << "\n";
log() << "ConvertRValue called from line " << line << "\n";
PushExprKind push(*this, ExprKind::RValue);
return ToString(expr);
}
Expand Down Expand Up @@ -295,7 +295,7 @@ bool Converter::VisitFunctionDecl(clang::FunctionDecl *decl) {
if (!IsInMainFile(decl) && !decl_ids_.insert(GetID(decl)).second) {
return false;
}
decl->dump();
decl->dump(log());
curr_function_ = decl;
std::string function_name;
if (decl->isMain()) {
Expand Down Expand Up @@ -582,7 +582,7 @@ static bool recordDerivesCopy(const clang::RecordDecl *decl) {
}

bool Converter::VisitRecordDecl(clang::RecordDecl *decl) {
decl->dumpColor();
decl->dump(log());

// VisitCXXRecordDecl already visited the record
if (clang::isa<clang::CXXRecordDecl>(decl)) {
Expand Down Expand Up @@ -694,7 +694,7 @@ bool Converter::VisitCXXRecordDecl(clang::CXXRecordDecl *decl) {
materializeTemplateSpecialization(decl);
}

decl->dump();
decl->dump(log());

Mapper::AddRuleForUserDefinedType(decl);
if (!IsConvertibleCXXRecordDecl(decl)) {
Expand Down Expand Up @@ -741,7 +741,7 @@ bool Converter::VisitCXXRecordDecl(clang::CXXRecordDecl *decl) {
}

bool Converter::VisitCXXMethodDecl(clang::CXXMethodDecl *decl) {
decl->dump();
decl->dump(log());
if (!IsConvertibleCXXMethodDecl(decl)) {
return false;
}
Expand Down Expand Up @@ -1085,10 +1085,10 @@ bool Converter::VisitCXXForRangeStmt(clang::CXXForRangeStmt *stmt) {

if (!Mapper::Contains(range_init_type.getUnqualifiedType())) {
// FIXME: improve error handling
llvm::errs() << "for range stmts only for types in std namespace\n";
log() << "for range stmts only for types in std namespace\n";
}

llvm::errs() << "GetClassName: " << GetClassName(range_init_type) << "\n";
log() << "GetClassName: " << GetClassName(range_init_type) << "\n";

if (GetClassName(range_init_type) == "std::map") {
return VisitCXXForRangeStmtMap(stmt);
Expand Down Expand Up @@ -2692,7 +2692,7 @@ bool Converter::VisitUnaryExprOrTypeTraitExpr(
break;
default:
// FIXME: improve error handling
llvm::errs() << "unsupported unary expr or type trait expr\n";
log() << "unsupported unary expr or type trait expr\n";
}
return false;
}
Expand Down Expand Up @@ -3437,7 +3437,7 @@ void Converter::ConvertUnsignedArithBinaryOperator(clang::BinaryOperator *op,
default:
// FIXME: improve error handling
llvm::errs() << "unsupported unsigned binary operator: " << opcode << '\n';
op->dumpColor();
op->dump();
assert(0);
}
PushParen paren(*this);
Expand Down Expand Up @@ -3747,9 +3747,9 @@ void Converter::SetFreshType(clang::QualType type) {
}

void Converter::dump_expr_kinds() {
llvm::errs() << "isRValue: " << isRValue() << ", isXValue: " << isXValue()
<< ", isAddrOf: " << isAddrOf() << ", isObject: " << isObject()
<< ", isVoid: " << isVoid() << "\n";
log() << "isRValue: " << isRValue() << ", isXValue: " << isXValue()
<< ", isAddrOf: " << isAddrOf() << ", isObject: " << isObject()
<< ", isVoid: " << isVoid() << "\n";
}

void Converter::emplace_back_plugin_construct_arg(
Expand Down
13 changes: 7 additions & 6 deletions cpp2rust/converter/converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "converter/lex.h"
#include "converter/translation_rule.h"
#include "logging.h"

namespace cpp2rust {
class Converter : public clang::RecursiveASTVisitor<Converter> {
Expand Down Expand Up @@ -329,8 +330,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {

template <typename... Ts>
inline void _StrCat(const char *func, int line, const Ts &...vals) {
llvm::errs() << '[' << func << ':' << line << "] ";
((llvm::errs() << vals << '\n', *rs_code_ += vals, *rs_code_ += ' '), ...);
log() << '[' << func << ':' << line << "] ";
((log() << vals << '\n', *rs_code_ += vals, *rs_code_ += ' '), ...);
}

class Buffer {
Expand Down Expand Up @@ -609,13 +610,13 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
int line = __builtin_LINE())
: c(c) {
c.curr_expr_kind_.push_back(k);
llvm::errs() << "PushExprKind " << file << ':' << line << ' ';
log() << "PushExprKind " << file << ':' << line << ' ';
c.dump_expr_kinds();
llvm::errs() << '[';
log() << '[';
for (const auto k : c.curr_expr_kind_) {
llvm::errs() << c.expr_kind_to_string(k) << ", ";
log() << c.expr_kind_to_string(k) << ", ";
}
llvm::errs() << "]\n";
log() << "]\n";
}
~PushExprKind() { c.curr_expr_kind_.pop_back(); }
};
Expand Down
2 changes: 1 addition & 1 deletion cpp2rust/converter/converter_lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ const char *GetOverloadedOperator(const clang::FunctionDecl *decl) {
return "lt";
default:
// FIXME: improve error handling
llvm::errs() << "unsupported overloaded operator\n";
log() << "unsupported overloaded operator\n";
return "";
}
}
Expand Down
4 changes: 3 additions & 1 deletion cpp2rust/converter/converter_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <string_view>
#include <vector>

#include "logging.h"

namespace cpp2rust {

// Order matters: each category is a superset of the previous one.
Expand Down Expand Up @@ -116,7 +118,7 @@ void ForEachTemplateArgument(
break;
default:
// FIXME: improve logging
llvm::errs() << "unsupported template argument kind\n";
log() << "unsupported template argument kind\n";
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions cpp2rust/converter/mapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,21 +384,20 @@ TranslationRule::ExprRule *search(const clang::Expr *expr) {
auto qualified_name = ToString(expr);
auto [rule, subs] =
search(exprs_, qualified_name, GetExprMapKey(qualified_name));
llvm::errs() << "search expr " << qualified_name << ", result:\n";
log() << "search expr " << qualified_name << ", result:\n";
if (rule) {
rule->dump();
} else {
llvm::errs() << "None\n";
log() << "None\n";
}
return rule;
}

TranslationRule::TypeRule *search(clang::QualType qual_type) {
auto type = ToString(qual_type);
auto [rule, subs] = search(types_, type, GetTypeMapKey(type));
llvm::errs() << "search type " << type
<< ", result: " << (rule ? rule->type_info.type : "None")
<< '\n';
log() << "search type " << type
<< ", result: " << (rule ? rule->type_info.type : "None") << '\n';
return rule;
}

Expand All @@ -408,7 +407,7 @@ void addRulesFromDirectory(const std::filesystem::path &dir, Model model) {
if (entry.is_regular_file() && path.extension() == ".cpp") {
auto [expr_rules, type_rules] = TranslationRule::Load(path, model);
if (expr_rules.empty() && type_rules.empty()) {
llvm::errs() << "No rules found in " << path << '\n';
log() << "No rules found in " << path << '\n';
continue;
}
for (auto &[_, rule] : expr_rules) {
Expand Down Expand Up @@ -885,11 +884,11 @@ void LoadTranslationRules(Model model, clang::ASTContext &ctx,

#if 0
for (auto &[src, rule] : exprs_) {
llvm::errs() << "Expr key: " << src << '\n';
log() << "Expr key: " << src << '\n';
rule.dump();
}
for (auto &[src, rule] : types_) {
llvm::errs() << "Type key: " << src << '\n';
log() << "Type key: " << src << '\n';
rule.dump();
}
#endif
Expand Down
12 changes: 6 additions & 6 deletions cpp2rust/converter/models/converter_refcount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,21 +245,21 @@ class ConverterRefCount final : public Converter {
if (pushed) {
c.conversion_kind_.push_back(k);
}
llvm::errs() << "[PushConversionKind:" << line << "] ";
log() << "[PushConversionKind:" << line << "] ";
for (auto ck : c.conversion_kind_) {
llvm::errs() << c.ConversionKindToString(ck) << ", ";
log() << c.ConversionKindToString(ck) << ", ";
}
llvm::errs() << "\n";
log() << "\n";
}
~PushConversionKind() {
if (pushed) {
c.conversion_kind_.pop_back();
}
llvm::errs() << "[PopConversionKind] ";
log() << "[PopConversionKind] ";
for (auto ck : c.conversion_kind_) {
llvm::errs() << c.ConversionKindToString(ck) << ", ";
log() << c.ConversionKindToString(ck) << ", ";
}
llvm::errs() << "\n";
log() << "\n";
}
};

Expand Down
2 changes: 1 addition & 1 deletion cpp2rust/converter/plugins/emplace_back.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ bool Converter::emplace_back_plugin_convert(clang::CallExpr *call) {
StrCat(GetUnsafeTypeAsString(elem_ty));
}
} else {
call->dumpColor();
call->dump();
assert(0 && "no ctor and no pod type");
return false;
}
Expand Down
51 changes: 24 additions & 27 deletions cpp2rust/converter/translation_rule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include "compat/platform_flags.h"
#include "converter/mapper.h"
#include "logging.h"

namespace cpp2rust::TranslationRule {

Expand Down Expand Up @@ -900,21 +901,19 @@ void BodyFragmentDump(const BodyFragment &frag) {

} // namespace

void TextFragment::dump() const {
llvm::errs() << " text: \"" << text << "\"\n";
}
void TextFragment::dump() const { log() << " text: \"" << text << "\"\n"; }

void PlaceholderFragment::dump() const {
llvm::errs() << " placeholder: " << n;
log() << " placeholder: " << n;
switch (access) {
case Access::kRead:
llvm::errs() << " (read)\n";
log() << " (read)\n";
break;
case Access::kWrite:
llvm::errs() << " (write)\n";
log() << " (write)\n";
break;
case Access::kMove:
llvm::errs() << " (move)\n";
log() << " (move)\n";
break;
}
}
Expand All @@ -929,61 +928,59 @@ const PlaceholderFragment *MethodCallFragment::getReceiverPlaceholder() const {
}

void MethodCallFragment::dump() const {
llvm::errs() << " method_call:\n"
" receiver:\n";
log() << " method_call:\n"
" receiver:\n";
for (const auto &frag : receiver) {
BodyFragmentDump(frag);
}
llvm::errs() << " body:\n";
log() << " body:\n";
for (const auto &frag : body) {
BodyFragmentDump(frag);
}
}

void ExprRule::dump() const {
llvm::errs() << "Matching: " << src << '\n';
log() << "Matching: " << src << '\n';
unsigned i = 0;
for (auto &info : params) {
llvm::errs() << " param a" << i++ << ": ";
log() << " param a" << i++ << ": ";
info.dump();
llvm::errs() << '\n';
log() << '\n';
}
if (!return_type.type.empty()) {
llvm::errs() << " return: ";
log() << " return: ";
return_type.dump();
llvm::errs() << '\n';
log() << '\n';
}
i = 0;
for (auto &bounds : generics) {
llvm::errs() << " generic T" << ++i << ':';
log() << " generic T" << ++i << ':';
for (auto &b : bounds) {
llvm::errs() << ' ' << b;
log() << ' ' << b;
}
llvm::errs() << '\n';
log() << '\n';
}
for (const auto &frag : body) {
BodyFragmentDump(frag);
}
}

void GenericFragment::dump() const {
llvm::errs() << " generic: " << n << '\n';
}
void GenericFragment::dump() const { log() << " generic: " << n << '\n'; }

void TypeInfo::dump() const {
llvm::errs() << type;
log() << type;
if (is_refcount_pointer)
llvm::errs() << " [rc_ptr]";
log() << " [rc_ptr]";
if (is_unsafe_pointer)
llvm::errs() << " [unsafe_ptr]";
log() << " [unsafe_ptr]";
}

void TypeRule::dump() const {
llvm::errs() << "name: " << src << "\n Rust type: ";
log() << "name: " << src << "\n Rust type: ";
type_info.dump();
llvm::errs() << '\n';
log() << '\n';
if (!initializer.empty()) {
llvm::errs() << " init: " << initializer << '\n';
log() << " init: " << initializer << '\n';
}
}

Expand Down
Loading
Loading