Skip to content
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.

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

Fix 3845 nullptr cpp #3958

Merged
merged 2 commits into from
Nov 14, 2022
Merged

Fix 3845 nullptr cpp #3958

merged 2 commits into from
Nov 14, 2022

Conversation

parrt
Copy link
Member

@parrt parrt commented Nov 14, 2022

Fixed while doing #3817 Also see @kaby76's fix that I implemented: antlr/grammars-v4#2909

…ay of parent contexts, last one of which is nullptr.

Signed-off-by: Terence Parr <parrt@antlr.org>
@parrt parrt changed the base branch from master to dev November 14, 2022 01:41
Signed-off-by: Terence Parr <parrt@antlr.org>
@parrt parrt added this to the 4.11.2 milestone Nov 14, 2022
@parrt parrt merged commit 9d830ab into antlr:dev Nov 14, 2022
Comment on lines +28 to 30
if (lhs == nullptr && rhs == nullptr) return true;
if (lhs != nullptr || rhs != nullptr) return false;
return *lhs == *rhs;
Copy link
Member

@KvanTTT KvanTTT Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks incorrect. Last line is never executed since it return false if any or both arguments are not null. Also, it's not optimal. I suggest fixing in the following way:

Suggested change
if (lhs == nullptr && rhs == nullptr) return true;
if (lhs != nullptr || rhs != nullptr) return false;
return *lhs == *rhs;
if (lhs == nullptr)
return rhs == nullptr;
else
return rhs != nullptr;
return *lhs == *rhs;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dang! you're right. I tried to get too clever. grrr...will fix. thanks.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is your line 32 dead code?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this?

if ( lhs == nullptr ) return rhs == nullptr;
if ( rhs == nullptr ) return false; // lhs!=null and rhs==null
return *lhs == *rhs;                // both nonnull

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not dead, it's comparison by dereference (if I remember and understand C++ correctly).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meaning your line 32 is never reached.

Copy link
Member

@KvanTTT KvanTTT Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, my first suggestion is also incorrect. The fixed version:

    if (lhs == nullptr)
        return rhs == nullptr;
    else if (rhs == nullptr)
        return false;
    return *lhs == *rhs;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep trying similar now. seems to work. this one still fails though, but this time with a SEGV #3959 rather than infinite loop.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's correct. Didn't get update in time.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushed the fix. thanks for finding! I updated trace diff for failing test: #3959

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants