This is an archive of the discontinued LLVM Phabricator instance.

Differential D154875

[MicrosoftDemangle] fix warn-trailing false positive
ClosedPublic

Authored by nickdesaulniers on Jul 10 2023, 12:14 PM.

Details

Reviewers
thakis
Commits
rG6641d2b7df35: [MicrosoftDemangle] fix warn-trailing false positive
Summary

A follow up to commit 6bad76c7ae93 ("[Demangle] fix windows tests")
based on @thakis' report.

Fixes: #63740

Diff Detail

Unit TestsFailed

TimeTest
4,500 msx64 debian > AddressSanitizer-x86_64-linux.TestCases/Linux::auto_memory_profile_test.cpp

Event Timeline

nickdesaulniers created this revision.Jul 10 2023, 12:14 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 10 2023, 12:14 PM
Herald added a subscriber: hiraditya. · View Herald Transcript
nickdesaulniers requested review of this revision.Jul 10 2023, 12:14 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 10 2023, 12:14 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
nickdesaulniers edited the summary of this revision. (Show Details)Jul 10 2023, 12:14 PM
nickdesaulniers added a reviewer: thakis.
nickdesaulniers added a subscriber: thakis.
nickdesaulniers added a child revision: D154876: [Demangle] use std::string_view::data rather than &*std::string_view::begin.Jul 10 2023, 1:34 PM
nickdesaulniers updated this revision to Diff 538809.Jul 10 2023, 1:39 PM
nickdesaulniers edited the summary of this revision. (Show Details)
  • format
nickdesaulniers edited the summary of this revision. (Show Details)Jul 10 2023, 1:40 PM
Harbormaster completed remote builds in B244269: Diff 538809.Jul 10 2023, 4:57 PM
thakis accepted this revision.Jul 11 2023, 9:06 AM

Thank you!

This revision is now accepted and ready to land.Jul 11 2023, 9:06 AM
This revision was landed with ongoing or failed builds.Jul 11 2023, 9:26 AM
Closed by commit rG6641d2b7df35: [MicrosoftDemangle] fix warn-trailing false positive (authored by nickdesaulniers). · Explain Why
This revision was automatically updated to reflect the committed changes.
nickdesaulniers added a commit: rG6641d2b7df35: [MicrosoftDemangle] fix warn-trailing false positive.

Revision Contents

PathSize
llvm/
lib/
Demangle/
3 lines
test/
Demangle/
5 lines

Diff 538809

llvm/lib/Demangle/MicrosoftDemangle.cpp

Show First 20 Lines • Show All 2,398 Lines • ▼ Show 20 Lines
char *llvm::microsoftDemangle(std::string_view MangledName, size_t *NMangled, char *llvm::microsoftDemangle(std::string_view MangledName, size_t *NMangled,
int *Status, MSDemangleFlags Flags) { int *Status, MSDemangleFlags Flags) {
Demangler D; Demangler D;
std::string_view Name{MangledName}; std::string_view Name{MangledName};
SymbolNode *AST = D.parse(Name); SymbolNode *AST = D.parse(Name);
if (!D.Error && NMangled) if (!D.Error && NMangled)
*NMangled = Name.empty() ? 0 : &*Name.begin() - &*MangledName.begin(); *NMangled = Name.empty() ? MangledName.size()
: &*Name.begin() - &*MangledName.begin();
if (Flags & MSDF_DumpBackrefs) if (Flags & MSDF_DumpBackrefs)
D.dumpBackReferences(); D.dumpBackReferences();
OutputFlags OF = OF_Default; OutputFlags OF = OF_Default;
if (Flags & MSDF_NoCallingConvention) if (Flags & MSDF_NoCallingConvention)
OF = OutputFlags(OF | OF_NoCallingConvention); OF = OutputFlags(OF | OF_NoCallingConvention);
if (Flags & MSDF_NoAccessSpecifier) if (Flags & MSDF_NoAccessSpecifier)
Show All 23 Lines

llvm/test/Demangle/warn-trailing.test

; RUN: llvm-undname -warn-trailing 2>&1 < %s | FileCheck %s ; RUN: llvm-undname -warn-trailing 2>&1 < %s | FileCheck %s
?x@@3HAasdf ?x@@3HAasdf
; CHECK: ?x@@3HAasdf ; CHECK: ?x@@3HAasdf
; CHECK-NEXT: int x ; CHECK-NEXT: int x
; CHECK-NEXT: warning: trailing characters: asdf ; CHECK-NEXT: warning: trailing characters: asdf
.?AVNet@@
; CHECK: .?AVNet@@
; CHECK-NEXT: class Net `RTTI Type Descriptor Name'
; CHECK-NOT: warning: trailing characters