Skip to content

[clang-repl] Improve error message on failed undos #149396

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 10 commits into from
Jul 23, 2025
Merged

[clang-repl] Improve error message on failed undos #149396

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f3fbebd
clarified %undo error msg in clang-repl
aadanen Jul 17, 2025
3c3dd8f
Merge branch 'main' of github.com:aadanen/llvm-project into issue143668
aadanen Jul 17, 2025
0b809e9
Merge branch 'llvm:main' into issue143668
aadanen Jul 17, 2025
b0513a8
implemented contextual error msg
aadanen Jul 19, 2025
9d9416a
Slight edit to error msg. Updated unit test.
aadanen Jul 20, 2025
d5280fe
lil type made me fail the tests
aadanen Jul 20, 2025
3f24540
Merge branch 'main' into issue143668
aadanen Jul 21, 2025
e86636d
formatting
aadanen Jul 22, 2025
849ea65
Merge branch 'issue143668' of github.com:aadanen/llvm-project into is…
aadanen Jul 22, 2025
135ac90
Merge branch 'main' into issue143668
aadanen Jul 22, 2025
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
11 changes: 9 additions & 2 deletions clang/lib/Interpreter/Interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,10 +761,17 @@ Interpreter::getSymbolAddressFromLinkerName(llvm::StringRef Name) const {

llvm::Error Interpreter::Undo(unsigned N) {

if (N > getEffectivePTUSize())
if (getEffectivePTUSize() == 0) {
return llvm::make_error<llvm::StringError>("Operation failed. "
"Too many undos",
"No input left to undo",
std::error_code());
} else if (N > getEffectivePTUSize()) {
return llvm::make_error<llvm::StringError>(
llvm::formatv("Operation failed. Wanted to undo {0} inputs, only have {1}.",
N, getEffectivePTUSize()),
std::error_code());
}

for (unsigned I = 0; I < N; I++) {
if (IncrExecutor) {
if (llvm::Error Err = IncrExecutor->removeModule(PTUs.back()))
Expand Down
4 changes: 2 additions & 2 deletions clang/unittests/Interpreter/InterpreterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ TEST_F(InterpreterTest, UndoCommand) {

// Fail to undo.
auto Err1 = Interp->Undo();
EXPECT_EQ("Operation failed. Too many undos",
EXPECT_EQ("Operation failed. No input left to undo",
llvm::toString(std::move(Err1)));
auto Err2 = Interp->Parse("int foo = 42;");
EXPECT_TRUE(!!Err2);
auto Err3 = Interp->Undo(2);
EXPECT_EQ("Operation failed. Too many undos",
EXPECT_EQ("Operation failed. Wanted to undo 2 inputs, only have 1.",
llvm::toString(std::move(Err3)));

// Succeed to undo.
Expand Down
Loading