Skip to content

gccrs: fix segfault in clone_pattern w macro #4217

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

gccrs: fix segfault in clone_pattern w macro #4217

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
15 changes: 9 additions & 6 deletions gcc/rust/expand/rust-macro-expand.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,12 +962,10 @@ transcribe_expression (Parser<MacroInvocLexer> &parser)

auto attrs = parser.parse_outer_attributes ();
auto expr = parser.parse_expr (std::move (attrs));
if (expr == nullptr)
{
for (auto error : parser.get_errors ())
error.emit ();
return AST::Fragment::create_error ();
}
for (auto error : parser.get_errors ())
error.emit ();
if (!expr)
return AST::Fragment::create_error ();

// FIXME: make this an error for some edititons
if (parser.peek_current_token ()->get_id () == SEMICOLON)
Expand Down Expand Up @@ -997,6 +995,8 @@ transcribe_type (Parser<MacroInvocLexer> &parser)
auto type = parser.parse_type (true);
for (auto err : parser.get_errors ())
err.emit ();
if (!type)
return AST::Fragment::create_error ();

auto end = lexer.get_offs ();

Expand All @@ -1018,6 +1018,9 @@ transcribe_pattern (Parser<MacroInvocLexer> &parser)
for (auto err : parser.get_errors ())
err.emit ();

if (!pattern)
return AST::Fragment::create_error ();

auto end = lexer.get_offs ();

return AST::Fragment ({std::move (pattern)},
Expand Down
Loading