This is an archive of the discontinued LLVM Phabricator instance.

Differential D126480

[demangler][RISCV] Fix for long double
ClosedPublic

Authored by piggynl on May 26 2022, 8:29 AM.

Details

Reviewers
rsmith
urnathan
Group Reviewers
Restricted Project
Commits
rG842e48bd6577: [demangler][RISCV] Fix for long double
Summary

The size of long double in RISCV (both RV32 and RV64) is 16 bytes, thus the mangled_size should be 32.

This patch will fix the test case "_ZN5test01hIfEEvRAcvjplstT_Le4001a000000000000000E_c" in /libcxxabi/test/test_demangle.pass.cpp, which is expected to be invalid but demangler returned "void test0::h<float>(char (&) [(unsigned int)((sizeof (float)) + (0x0.000000004001ap-16382L))])" in RISCV environment without this patch.

Diff Detail

Event Timeline

piggynl created this revision.May 26 2022, 8:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 26 2022, 8:29 AM
Herald added subscribers: sunshaoce, VincentWu, luke957 and 14 others. · View Herald Transcript
piggynl requested review of this revision.May 26 2022, 8:29 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 26 2022, 8:29 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, libcxx-commits, • pcwang-thead and 2 others. · View Herald Transcript
piggynl edited the summary of this revision. (Show Details)May 26 2022, 8:32 AM
piggynl updated this revision to Diff 432296.May 26 2022, 8:37 AM

(included more context)

urnathan accepted this revision.May 26 2022, 9:45 AM
urnathan added a subscriber: urnathan.

LGTM

This revision is now accepted and ready to land.May 26 2022, 9:45 AM
Harbormaster completed remote builds in B166486: Diff 432296.May 26 2022, 3:33 PM
This revision was landed with ongoing or failed builds.May 26 2022, 10:53 PM
Closed by commit rG842e48bd6577: [demangler][RISCV] Fix for long double (authored by piggynl). · Explain Why
This revision was automatically updated to reflect the committed changes.
piggynl added a commit: rG842e48bd6577: [demangler][RISCV] Fix for long double.
SixWeining mentioned this in D138981: [demangler][LoongArch] Correct the mangled_size for long double.Nov 29 2022, 10:43 PM
SixWeining mentioned this in rGecd0337854b9: [demangler][LoongArch] Correct the mangled_size for long double.Dec 7 2022, 6:22 PM

Revision Contents

PathSize
libcxxabi/
src/
demangle/
2 lines
llvm/
include/
llvm/
Demangle/
2 lines

Diff 432466

libcxxabi/src/demangle/ItaniumDemangle.h

Show First 20 Lines • Show All 5,093 Lines • ▼ Show 20 Linesstruct FloatData<double>
static const size_t max_demangled_size = 32; static const size_t max_demangled_size = 32;
static constexpr const char* spec = "%a"; static constexpr const char* spec = "%a";
}; };
template <> template <>
struct FloatData<long double> struct FloatData<long double>
{ {
#if defined(__mips__) && defined(__mips_n64) || defined(__aarch64__) || \ #if defined(__mips__) && defined(__mips_n64) || defined(__aarch64__) || \
defined(__wasm__) defined(__wasm__) || defined(__riscv)
static const size_t mangled_size = 32; static const size_t mangled_size = 32;
#elif defined(__arm__) || defined(__mips__) || defined(__hexagon__) #elif defined(__arm__) || defined(__mips__) || defined(__hexagon__)
static const size_t mangled_size = 16; static const size_t mangled_size = 16;
#else #else
static const size_t mangled_size = 20; // May need to be adjusted to 16 or 24 on other platforms static const size_t mangled_size = 20; // May need to be adjusted to 16 or 24 on other platforms
#endif #endif
// `-0x1.ffffffffffffffffffffffffffffp+16383` + 'L' + '\0' == 42 bytes. // `-0x1.ffffffffffffffffffffffffffffp+16383` + 'L' + '\0' == 42 bytes.
// 28 'f's * 4 bits == 112 bits, which is the number of mantissa bits. // 28 'f's * 4 bits == 112 bits, which is the number of mantissa bits.
▲ Show 20 Lines • Show All 370 Lines • Show Last 20 Lines

llvm/include/llvm/Demangle/ItaniumDemangle.h

Show First 20 Lines • Show All 5,093 Lines • ▼ Show 20 Linesstruct FloatData<double>
static const size_t max_demangled_size = 32; static const size_t max_demangled_size = 32;
static constexpr const char* spec = "%a"; static constexpr const char* spec = "%a";
}; };
template <> template <>
struct FloatData<long double> struct FloatData<long double>
{ {
#if defined(__mips__) && defined(__mips_n64) || defined(__aarch64__) || \ #if defined(__mips__) && defined(__mips_n64) || defined(__aarch64__) || \
defined(__wasm__) defined(__wasm__) || defined(__riscv)
static const size_t mangled_size = 32; static const size_t mangled_size = 32;
#elif defined(__arm__) || defined(__mips__) || defined(__hexagon__) #elif defined(__arm__) || defined(__mips__) || defined(__hexagon__)
static const size_t mangled_size = 16; static const size_t mangled_size = 16;
#else #else
static const size_t mangled_size = 20; // May need to be adjusted to 16 or 24 on other platforms static const size_t mangled_size = 20; // May need to be adjusted to 16 or 24 on other platforms
#endif #endif
// `-0x1.ffffffffffffffffffffffffffffp+16383` + 'L' + '\0' == 42 bytes. // `-0x1.ffffffffffffffffffffffffffffp+16383` + 'L' + '\0' == 42 bytes.
// 28 'f's * 4 bits == 112 bits, which is the number of mantissa bits. // 28 'f's * 4 bits == 112 bits, which is the number of mantissa bits.
▲ Show 20 Lines • Show All 370 Lines • Show Last 20 Lines