[PATCH] D119542: [demangler] Reorder parseNestedName loop
Nathan Sidwell via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 16 04:32:05 PST 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG6244730e29f6: [demangler] Reorder parseNestedName loop (authored by urnathan).
Herald added a project: libc++abi.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++abi.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D119542/new/
https://reviews.llvm.org/D119542
Files:
libcxxabi/src/demangle/ItaniumDemangle.h
libcxxabi/test/test_demangle.pass.cpp
llvm/include/llvm/Demangle/ItaniumDemangle.h
Index: llvm/include/llvm/Demangle/ItaniumDemangle.h
===================================================================
--- llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -3188,15 +3188,6 @@
Node *SoFar = nullptr;
while (!consumeIf('E')) {
- consumeIf('L'); // extension
-
- if (consumeIf('M')) {
- // <data-member-prefix> := <member source-name> [<template-args>] M
- if (SoFar == nullptr)
- return nullptr;
- continue;
- }
-
if (State)
// Only set end-with-template on the case that does that.
State->EndsWithTemplateArgs = false;
@@ -3241,12 +3232,17 @@
return nullptr;
continue; // Do not push a new substitution.
} else {
+ consumeIf('L'); // extension
// ::= [<prefix>] <unqualified-name>
SoFar = getDerived().parseUnqualifiedName(State, SoFar);
}
if (SoFar == nullptr)
return nullptr;
Subs.push_back(SoFar);
+
+ // No longer used.
+ // <data-member-prefix> := <member source-name> [<template-args>] M
+ consumeIf('M');
}
if (SoFar == nullptr || Subs.empty())
Index: libcxxabi/test/test_demangle.pass.cpp
===================================================================
--- libcxxabi/test/test_demangle.pass.cpp
+++ libcxxabi/test/test_demangle.pass.cpp
@@ -29947,6 +29947,9 @@
"_ZN3CLSIiEIiEE",
"_ZN3CLSDtLi0EEE",
"_ZN3CLSIiEEvNS_T_Ev",
+
+ "_ZN1fIiEEvNTUt_E",
+ "_ZNDTUt_Ev",
};
const unsigned NI = sizeof(invalid_cases) / sizeof(invalid_cases[0]);
Index: libcxxabi/src/demangle/ItaniumDemangle.h
===================================================================
--- libcxxabi/src/demangle/ItaniumDemangle.h
+++ libcxxabi/src/demangle/ItaniumDemangle.h
@@ -3188,15 +3188,6 @@
Node *SoFar = nullptr;
while (!consumeIf('E')) {
- consumeIf('L'); // extension
-
- if (consumeIf('M')) {
- // <data-member-prefix> := <member source-name> [<template-args>] M
- if (SoFar == nullptr)
- return nullptr;
- continue;
- }
-
if (State)
// Only set end-with-template on the case that does that.
State->EndsWithTemplateArgs = false;
@@ -3241,12 +3232,17 @@
return nullptr;
continue; // Do not push a new substitution.
} else {
+ consumeIf('L'); // extension
// ::= [<prefix>] <unqualified-name>
SoFar = getDerived().parseUnqualifiedName(State, SoFar);
}
if (SoFar == nullptr)
return nullptr;
Subs.push_back(SoFar);
+
+ // No longer used.
+ // <data-member-prefix> := <member source-name> [<template-args>] M
+ consumeIf('M');
}
if (SoFar == nullptr || Subs.empty())
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D119542.409207.patch
Type: text/x-patch
Size: 2731 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220216/17e1d08a/attachment.bin>
More information about the llvm-commits
mailing list