Skip to content

Fix C++ mangling of real for MSVC targets #2974

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

Merged
kinke merged 1 commit into from
Jan 20, 2019
Merged

Fix C++ mangling of real for MSVC targets #2974

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions dmd/cppmanglewin.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,10 @@ public:
case Tuns64:
case Tint128:
case Tuns128:
version (IN_LLVM) {} else
{
case Tfloat80:
}
case Twchar:
if (checkTypeSaved(type))
return;
Expand Down Expand Up @@ -242,10 +245,19 @@ public:
break;
// unsigned int
case Tfloat80:
version (IN_LLVM)
{
// unlike DMD, LDC uses 64-bit `real` for Windows/MSVC targets,
// corresponding to MSVC++ long double
buf.writeByte('O'); // Visual C++ long double
}
else
{
if (flags & IS_DMC)
buf.writestring("_Z"); // DigitalMars long double
else
buf.writestring("_T"); // Intel long double
}
break;
case Twchar:
if (flags & IS_DMC)
Expand Down
23 changes: 23 additions & 0 deletions tests/codegen/mangling_real_real.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Tests that repeated `real` return types are treated as built-in types in C++ mangling (no substitution).

// REQUIRES: target_X86

// RUN: %ldc -mtriple=x86_64-linux -c -output-ll -of=%t.ll %s && FileCheck %s --check-prefix=LINUX < %t.ll
// RUN: %ldc -mtriple=x86_64-android -c -output-ll -of=%t.android.ll %s && FileCheck %s --check-prefix=ANDROID < %t.android.ll
// RUN: %ldc -mtriple=x86_64-windows -c -output-ll -of=%t.windows.ll %s && FileCheck %s --check-prefix=WINDOWS < %t.windows.ll

import core.stdc.config;

// LINUX: define {{.*}}Z8withrealee
// ANDROID: define {{.*}}Z8withrealgg
// WINDOWS: define {{.*}}?withreal@@YAXOO@Z
extern (C++) void withreal(real a, real b)
{
}

// LINUX: define {{.*}}Z15withclongdoubleee
// ANDROID: define {{.*}}Z15withclongdoublegg
// WINDOWS: define {{.*}}?withclongdouble@@YAXOO@Z
extern (C++) void withclongdouble(c_long_double a, c_long_double b)
{
}