[libc++][modules] Uses _LIBCPP_USING_IF_EXISTS. #90409
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Mark de Wever (mordante) ChangesThis attribute is used in the headers. Not using this in the modules has led to several issues. Add them to the modules to avoid these errors in other placed. Patch is 82.82 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/90409.diff 33 Files Affected:
diff --git a/libcxx/modules/std.compat/cctype.inc b/libcxx/modules/std.compat/cctype.inc
index 56fb45a374a510..5cde12ddb38d78 100644
--- a/libcxx/modules/std.compat/cctype.inc
+++ b/libcxx/modules/std.compat/cctype.inc
@@ -8,18 +8,18 @@
//===----------------------------------------------------------------------===//
export {
- using ::isalnum;
- using ::isalpha;
- using ::isblank;
- using ::iscntrl;
- using ::isdigit;
- using ::isgraph;
- using ::islower;
- using ::isprint;
- using ::ispunct;
- using ::isspace;
- using ::isupper;
- using ::isxdigit;
- using ::tolower;
- using ::toupper;
+ using ::isalnum _LIBCPP_USING_IF_EXISTS;
+ using ::isalpha _LIBCPP_USING_IF_EXISTS;
+ using ::isblank _LIBCPP_USING_IF_EXISTS;
+ using ::iscntrl _LIBCPP_USING_IF_EXISTS;
+ using ::isdigit _LIBCPP_USING_IF_EXISTS;
+ using ::isgraph _LIBCPP_USING_IF_EXISTS;
+ using ::islower _LIBCPP_USING_IF_EXISTS;
+ using ::isprint _LIBCPP_USING_IF_EXISTS;
+ using ::ispunct _LIBCPP_USING_IF_EXISTS;
+ using ::isspace _LIBCPP_USING_IF_EXISTS;
+ using ::isupper _LIBCPP_USING_IF_EXISTS;
+ using ::isxdigit _LIBCPP_USING_IF_EXISTS;
+ using ::tolower _LIBCPP_USING_IF_EXISTS;
+ using ::toupper _LIBCPP_USING_IF_EXISTS;
} // export
diff --git a/libcxx/modules/std.compat/cfenv.inc b/libcxx/modules/std.compat/cfenv.inc
index 50128463d6a914..5a373f64697120 100644
--- a/libcxx/modules/std.compat/cfenv.inc
+++ b/libcxx/modules/std.compat/cfenv.inc
@@ -9,21 +9,21 @@
export {
// types
- using ::fenv_t;
- using ::fexcept_t;
+ using ::fenv_t _LIBCPP_USING_IF_EXISTS;
+ using ::fexcept_t _LIBCPP_USING_IF_EXISTS;
// functions
- using ::feclearexcept;
- using ::fegetexceptflag;
- using ::feraiseexcept;
- using ::fesetexceptflag;
- using ::fetestexcept;
+ using ::feclearexcept _LIBCPP_USING_IF_EXISTS;
+ using ::fegetexceptflag _LIBCPP_USING_IF_EXISTS;
+ using ::feraiseexcept _LIBCPP_USING_IF_EXISTS;
+ using ::fesetexceptflag _LIBCPP_USING_IF_EXISTS;
+ using ::fetestexcept _LIBCPP_USING_IF_EXISTS;
- using ::fegetround;
- using ::fesetround;
+ using ::fegetround _LIBCPP_USING_IF_EXISTS;
+ using ::fesetround _LIBCPP_USING_IF_EXISTS;
- using ::fegetenv;
- using ::feholdexcept;
- using ::fesetenv;
- using ::feupdateenv;
+ using ::fegetenv _LIBCPP_USING_IF_EXISTS;
+ using ::feholdexcept _LIBCPP_USING_IF_EXISTS;
+ using ::fesetenv _LIBCPP_USING_IF_EXISTS;
+ using ::feupdateenv _LIBCPP_USING_IF_EXISTS;
} // export
diff --git a/libcxx/modules/std.compat/cinttypes.inc b/libcxx/modules/std.compat/cinttypes.inc
index a64c088d0d6f88..4789ec33102008 100644
--- a/libcxx/modules/std.compat/cinttypes.inc
+++ b/libcxx/modules/std.compat/cinttypes.inc
@@ -8,14 +8,14 @@
//===----------------------------------------------------------------------===//
export {
- using ::imaxdiv_t;
+ using ::imaxdiv_t _LIBCPP_USING_IF_EXISTS;
- using ::imaxabs;
- using ::imaxdiv;
- using ::strtoimax;
- using ::strtoumax;
- using ::wcstoimax;
- using ::wcstoumax;
+ using ::imaxabs _LIBCPP_USING_IF_EXISTS;
+ using ::imaxdiv _LIBCPP_USING_IF_EXISTS;
+ using ::strtoimax _LIBCPP_USING_IF_EXISTS;
+ using ::strtoumax _LIBCPP_USING_IF_EXISTS;
+ using ::wcstoimax _LIBCPP_USING_IF_EXISTS;
+ using ::wcstoumax _LIBCPP_USING_IF_EXISTS;
// abs is conditionally here, but always present in cmath.cppm. To avoid
// conflicing declarations omit the using here.
diff --git a/libcxx/modules/std.compat/clocale.inc b/libcxx/modules/std.compat/clocale.inc
index d9785a73794300..1a975c560a496d 100644
--- a/libcxx/modules/std.compat/clocale.inc
+++ b/libcxx/modules/std.compat/clocale.inc
@@ -9,9 +9,9 @@
export {
#ifndef _LIBCPP_HAS_NO_LOCALIZATION
- using ::lconv;
+ using ::lconv _LIBCPP_USING_IF_EXISTS;
- using ::localeconv;
- using ::setlocale;
+ using ::localeconv _LIBCPP_USING_IF_EXISTS;
+ using ::setlocale _LIBCPP_USING_IF_EXISTS;
#endif // _LIBCPP_HAS_NO_LOCALIZATION
} // export
diff --git a/libcxx/modules/std.compat/cmath.inc b/libcxx/modules/std.compat/cmath.inc
index de5379275c5fae..6c86d0df574062 100644
--- a/libcxx/modules/std.compat/cmath.inc
+++ b/libcxx/modules/std.compat/cmath.inc
@@ -8,241 +8,241 @@
//===----------------------------------------------------------------------===//
export {
- using ::double_t;
- using ::float_t;
+ using ::double_t _LIBCPP_USING_IF_EXISTS;
+ using ::float_t _LIBCPP_USING_IF_EXISTS;
- using ::acos;
- using ::acosf;
- using ::acosl;
+ using ::acos _LIBCPP_USING_IF_EXISTS;
+ using ::acosf _LIBCPP_USING_IF_EXISTS;
+ using ::acosl _LIBCPP_USING_IF_EXISTS;
- using ::asin;
- using ::asinf;
- using ::asinl;
+ using ::asin _LIBCPP_USING_IF_EXISTS;
+ using ::asinf _LIBCPP_USING_IF_EXISTS;
+ using ::asinl _LIBCPP_USING_IF_EXISTS;
- using ::atan;
- using ::atanf;
- using ::atanl;
+ using ::atan _LIBCPP_USING_IF_EXISTS;
+ using ::atanf _LIBCPP_USING_IF_EXISTS;
+ using ::atanl _LIBCPP_USING_IF_EXISTS;
- using ::atan2;
- using ::atan2f;
- using ::atan2l;
+ using ::atan2 _LIBCPP_USING_IF_EXISTS;
+ using ::atan2f _LIBCPP_USING_IF_EXISTS;
+ using ::atan2l _LIBCPP_USING_IF_EXISTS;
- using ::cos;
- using ::cosf;
- using ::cosl;
+ using ::cos _LIBCPP_USING_IF_EXISTS;
+ using ::cosf _LIBCPP_USING_IF_EXISTS;
+ using ::cosl _LIBCPP_USING_IF_EXISTS;
- using ::sin;
- using ::sinf;
- using ::sinl;
+ using ::sin _LIBCPP_USING_IF_EXISTS;
+ using ::sinf _LIBCPP_USING_IF_EXISTS;
+ using ::sinl _LIBCPP_USING_IF_EXISTS;
- using ::tan;
- using ::tanf;
- using ::tanl;
+ using ::tan _LIBCPP_USING_IF_EXISTS;
+ using ::tanf _LIBCPP_USING_IF_EXISTS;
+ using ::tanl _LIBCPP_USING_IF_EXISTS;
- using ::acosh;
- using ::acoshf;
- using ::acoshl;
+ using ::acosh _LIBCPP_USING_IF_EXISTS;
+ using ::acoshf _LIBCPP_USING_IF_EXISTS;
+ using ::acoshl _LIBCPP_USING_IF_EXISTS;
- using ::asinh;
- using ::asinhf;
- using ::asinhl;
+ using ::asinh _LIBCPP_USING_IF_EXISTS;
+ using ::asinhf _LIBCPP_USING_IF_EXISTS;
+ using ::asinhl _LIBCPP_USING_IF_EXISTS;
- using ::atanh;
- using ::atanhf;
- using ::atanhl;
+ using ::atanh _LIBCPP_USING_IF_EXISTS;
+ using ::atanhf _LIBCPP_USING_IF_EXISTS;
+ using ::atanhl _LIBCPP_USING_IF_EXISTS;
- using ::cosh;
- using ::coshf;
- using ::coshl;
+ using ::cosh _LIBCPP_USING_IF_EXISTS;
+ using ::coshf _LIBCPP_USING_IF_EXISTS;
+ using ::coshl _LIBCPP_USING_IF_EXISTS;
- using ::sinh;
- using ::sinhf;
- using ::sinhl;
+ using ::sinh _LIBCPP_USING_IF_EXISTS;
+ using ::sinhf _LIBCPP_USING_IF_EXISTS;
+ using ::sinhl _LIBCPP_USING_IF_EXISTS;
- using ::tanh;
- using ::tanhf;
- using ::tanhl;
+ using ::tanh _LIBCPP_USING_IF_EXISTS;
+ using ::tanhf _LIBCPP_USING_IF_EXISTS;
+ using ::tanhl _LIBCPP_USING_IF_EXISTS;
- using ::exp;
- using ::expf;
- using ::expl;
+ using ::exp _LIBCPP_USING_IF_EXISTS;
+ using ::expf _LIBCPP_USING_IF_EXISTS;
+ using ::expl _LIBCPP_USING_IF_EXISTS;
- using ::exp2;
- using ::exp2f;
- using ::exp2l;
+ using ::exp2 _LIBCPP_USING_IF_EXISTS;
+ using ::exp2f _LIBCPP_USING_IF_EXISTS;
+ using ::exp2l _LIBCPP_USING_IF_EXISTS;
- using ::expm1;
- using ::expm1f;
- using ::expm1l;
+ using ::expm1 _LIBCPP_USING_IF_EXISTS;
+ using ::expm1f _LIBCPP_USING_IF_EXISTS;
+ using ::expm1l _LIBCPP_USING_IF_EXISTS;
- using ::frexp;
- using ::frexpf;
- using ::frexpl;
+ using ::frexp _LIBCPP_USING_IF_EXISTS;
+ using ::frexpf _LIBCPP_USING_IF_EXISTS;
+ using ::frexpl _LIBCPP_USING_IF_EXISTS;
- using ::ilogb;
- using ::ilogbf;
- using ::ilogbl;
+ using ::ilogb _LIBCPP_USING_IF_EXISTS;
+ using ::ilogbf _LIBCPP_USING_IF_EXISTS;
+ using ::ilogbl _LIBCPP_USING_IF_EXISTS;
- using ::ldexp;
- using ::ldexpf;
- using ::ldexpl;
+ using ::ldexp _LIBCPP_USING_IF_EXISTS;
+ using ::ldexpf _LIBCPP_USING_IF_EXISTS;
+ using ::ldexpl _LIBCPP_USING_IF_EXISTS;
- using ::log;
- using ::logf;
- using ::logl;
+ using ::log _LIBCPP_USING_IF_EXISTS;
+ using ::logf _LIBCPP_USING_IF_EXISTS;
+ using ::logl _LIBCPP_USING_IF_EXISTS;
- using ::log10;
- using ::log10f;
- using ::log10l;
+ using ::log10 _LIBCPP_USING_IF_EXISTS;
+ using ::log10f _LIBCPP_USING_IF_EXISTS;
+ using ::log10l _LIBCPP_USING_IF_EXISTS;
- using ::log1p;
- using ::log1pf;
- using ::log1pl;
+ using ::log1p _LIBCPP_USING_IF_EXISTS;
+ using ::log1pf _LIBCPP_USING_IF_EXISTS;
+ using ::log1pl _LIBCPP_USING_IF_EXISTS;
- using ::log2;
- using ::log2f;
- using ::log2l;
+ using ::log2 _LIBCPP_USING_IF_EXISTS;
+ using ::log2f _LIBCPP_USING_IF_EXISTS;
+ using ::log2l _LIBCPP_USING_IF_EXISTS;
- using ::logb;
- using ::logbf;
- using ::logbl;
+ using ::logb _LIBCPP_USING_IF_EXISTS;
+ using ::logbf _LIBCPP_USING_IF_EXISTS;
+ using ::logbl _LIBCPP_USING_IF_EXISTS;
- using ::modf;
- using ::modff;
- using ::modfl;
+ using ::modf _LIBCPP_USING_IF_EXISTS;
+ using ::modff _LIBCPP_USING_IF_EXISTS;
+ using ::modfl _LIBCPP_USING_IF_EXISTS;
- using ::scalbn;
- using ::scalbnf;
- using ::scalbnl;
+ using ::scalbn _LIBCPP_USING_IF_EXISTS;
+ using ::scalbnf _LIBCPP_USING_IF_EXISTS;
+ using ::scalbnl _LIBCPP_USING_IF_EXISTS;
- using ::scalbln;
- using ::scalblnf;
- using ::scalblnl;
+ using ::scalbln _LIBCPP_USING_IF_EXISTS;
+ using ::scalblnf _LIBCPP_USING_IF_EXISTS;
+ using ::scalblnl _LIBCPP_USING_IF_EXISTS;
- using ::cbrt;
- using ::cbrtf;
- using ::cbrtl;
+ using ::cbrt _LIBCPP_USING_IF_EXISTS;
+ using ::cbrtf _LIBCPP_USING_IF_EXISTS;
+ using ::cbrtl _LIBCPP_USING_IF_EXISTS;
// [c.math.abs], absolute values
- using ::abs;
+ using ::abs _LIBCPP_USING_IF_EXISTS;
- using ::fabs;
- using ::fabsf;
- using ::fabsl;
+ using ::fabs _LIBCPP_USING_IF_EXISTS;
+ using ::fabsf _LIBCPP_USING_IF_EXISTS;
+ using ::fabsl _LIBCPP_USING_IF_EXISTS;
- using ::hypot;
- using ::hypotf;
- using ::hypotl;
+ using ::hypot _LIBCPP_USING_IF_EXISTS;
+ using ::hypotf _LIBCPP_USING_IF_EXISTS;
+ using ::hypotl _LIBCPP_USING_IF_EXISTS;
// [c.math.hypot3], three-dimensional hypotenuse
- using ::pow;
- using ::powf;
- using ::powl;
+ using ::pow _LIBCPP_USING_IF_EXISTS;
+ using ::powf _LIBCPP_USING_IF_EXISTS;
+ using ::powl _LIBCPP_USING_IF_EXISTS;
- using ::sqrt;
- using ::sqrtf;
- using ::sqrtl;
+ using ::sqrt _LIBCPP_USING_IF_EXISTS;
+ using ::sqrtf _LIBCPP_USING_IF_EXISTS;
+ using ::sqrtl _LIBCPP_USING_IF_EXISTS;
- using ::erf;
- using ::erff;
- using ::erfl;
+ using ::erf _LIBCPP_USING_IF_EXISTS;
+ using ::erff _LIBCPP_USING_IF_EXISTS;
+ using ::erfl _LIBCPP_USING_IF_EXISTS;
- using ::erfc;
- using ::erfcf;
- using ::erfcl;
+ using ::erfc _LIBCPP_USING_IF_EXISTS;
+ using ::erfcf _LIBCPP_USING_IF_EXISTS;
+ using ::erfcl _LIBCPP_USING_IF_EXISTS;
- using ::lgamma;
- using ::lgammaf;
- using ::lgammal;
+ using ::lgamma _LIBCPP_USING_IF_EXISTS;
+ using ::lgammaf _LIBCPP_USING_IF_EXISTS;
+ using ::lgammal _LIBCPP_USING_IF_EXISTS;
- using ::tgamma;
- using ::tgammaf;
- using ::tgammal;
+ using ::tgamma _LIBCPP_USING_IF_EXISTS;
+ using ::tgammaf _LIBCPP_USING_IF_EXISTS;
+ using ::tgammal _LIBCPP_USING_IF_EXISTS;
- using ::ceil;
- using ::ceilf;
- using ::ceill;
+ using ::ceil _LIBCPP_USING_IF_EXISTS;
+ using ::ceilf _LIBCPP_USING_IF_EXISTS;
+ using ::ceill _LIBCPP_USING_IF_EXISTS;
- using ::floor;
- using ::floorf;
- using ::floorl;
+ using ::floor _LIBCPP_USING_IF_EXISTS;
+ using ::floorf _LIBCPP_USING_IF_EXISTS;
+ using ::floorl _LIBCPP_USING_IF_EXISTS;
- using ::nearbyint;
- using ::nearbyintf;
- using ::nearbyintl;
+ using ::nearbyint _LIBCPP_USING_IF_EXISTS;
+ using ::nearbyintf _LIBCPP_USING_IF_EXISTS;
+ using ::nearbyintl _LIBCPP_USING_IF_EXISTS;
- using ::rint;
- using ::rintf;
- using ::rintl;
+ using ::rint _LIBCPP_USING_IF_EXISTS;
+ using ::rintf _LIBCPP_USING_IF_EXISTS;
+ using ::rintl _LIBCPP_USING_IF_EXISTS;
- using ::lrint;
- using ::lrintf;
- using ::lrintl;
+ using ::lrint _LIBCPP_USING_IF_EXISTS;
+ using ::lrintf _LIBCPP_USING_IF_EXISTS;
+ using ::lrintl _LIBCPP_USING_IF_EXISTS;
- using ::llrint;
- using ::llrintf;
- using ::llrintl;
+ using ::llrint _LIBCPP_USING_IF_EXISTS;
+ using ::llrintf _LIBCPP_USING_IF_EXISTS;
+ using ::llrintl _LIBCPP_USING_IF_EXISTS;
- using ::round;
- using ::roundf;
- using ::roundl;
+ using ::round _LIBCPP_USING_IF_EXISTS;
+ using ::roundf _LIBCPP_USING_IF_EXISTS;
+ using ::roundl _LIBCPP_USING_IF_EXISTS;
- using ::lround;
- using ::lroundf;
- using ::lroundl;
+ using ::lround _LIBCPP_USING_IF_EXISTS;
+ using ::lroundf _LIBCPP_USING_IF_EXISTS;
+ using ::lroundl _LIBCPP_USING_IF_EXISTS;
- using ::llround;
- using ::llroundf;
- using ::llroundl;
+ using ::llround _LIBCPP_USING_IF_EXISTS;
+ using ::llroundf _LIBCPP_USING_IF_EXISTS;
+ using ::llroundl _LIBCPP_USING_IF_EXISTS;
- using ::trunc;
- using ::truncf;
- using ::truncl;
+ using ::trunc _LIBCPP_USING_IF_EXISTS;
+ using ::truncf _LIBCPP_USING_IF_EXISTS;
+ using ::truncl _LIBCPP_USING_IF_EXISTS;
- using ::fmod;
- using ::fmodf;
- using ::fmodl;
+ using ::fmod _LIBCPP_USING_IF_EXISTS;
+ using ::fmodf _LIBCPP_USING_IF_EXISTS;
+ using ::fmodl _LIBCPP_USING_IF_EXISTS;
- using ::remainder;
- using ::remainderf;
- using ::remainderl;
+ using ::remainder _LIBCPP_USING_IF_EXISTS;
+ using ::remainderf _LIBCPP_USING_IF_EXISTS;
+ using ::remainderl _LIBCPP_USING_IF_EXISTS;
- using ::remquo;
- using ::remquof;
- using ::remquol;
+ using ::remquo _LIBCPP_USING_IF_EXISTS;
+ using ::remquof _LIBCPP_USING_IF_EXISTS;
+ using ::remquol _LIBCPP_USING_IF_EXISTS;
- using ::copysign;
- using ::copysignf;
- using ::copysignl;
+ using ::copysign _LIBCPP_USING_IF_EXISTS;
+ using ::copysignf _LIBCPP_USING_IF_EXISTS;
+ using ::copysignl _LIBCPP_USING_IF_EXISTS;
- using ::nan;
- using ::nanf;
- using ::nanl;
+ using ::nan _LIBCPP_USING_IF_EXISTS;
+ using ::nanf _LIBCPP_USING_IF_EXISTS;
+ using ::nanl _LIBCPP_USING_IF_EXISTS;
- using ::nextafter;
- using ::nextafterf;
- using ::nextafterl;
+ using ::nextafter _LIBCPP_USING_IF_EXISTS;
+ using ::nextafterf _LIBCPP_USING_IF_EXISTS;
+ using ::nextafterl _LIBCPP_USING_IF_EXISTS;
- using ::nexttoward;
- using ::nexttowardf;
- using ::nexttowardl;
+ using ::nexttoward _LIBCPP_USING_IF_EXISTS;
+ using ::nexttowardf _LIBCPP_USING_IF_EXISTS;
+ using ::nexttowardl _LIBCPP_USING_IF_EXISTS;
- using ::fdim;
- using ::fdimf;
- using ::fdiml;
+ using ::fdim _LIBCPP_USING_IF_EXISTS;
+ using ::fdimf _LIBCPP_USING_IF_EXISTS;
+ using ::fdiml _LIBCPP_USING_IF_EXISTS;
- using ::fmax;
- using ::fmaxf;
- using ::fmaxl;
+ using ::fmax _LIBCPP_USING_IF_EXISTS;
+ using ::fmaxf _LIBCPP_USING_IF_EXISTS;
+ using ::fmaxl _LIBCPP_USING_IF_EXISTS;
- using ::fmin;
- using ::fminf;
- using ::fminl;
+ using ::fmin _LIBCPP_USING_IF_EXISTS;
+ using ::fminf _LIBCPP_USING_IF_EXISTS;
+ using ::fminl _LIBCPP_USING_IF_EXISTS;
- using ::fma;
- using ::fmaf;
- using ::fmal;
+ using ::fma _LIBCPP_USING_IF_EXISTS;
+ using ::fmaf _LIBCPP_USING_IF_EXISTS;
+ using ::fmal _LIBCPP_USING_IF_EXISTS;
// [c.math.lerp], linear interpolation
// [support.c.headers.other]/1
@@ -251,18 +251,18 @@ export {
// ...
// [c.math.fpclass], classification / comparison functions
- using ::fpclassify;
- using ::isfinite;
- using ::isgreater;
- using ::isgreaterequal;
- using ::isinf;
- using ::isless;
- using ::islessequal;
- using ::islessgreater;
- using ::isnan;
- using ::isnormal;
- using ::isunordered;
- using ::signbit;
+ using ::fpclassify _LIBCPP_USING_IF_EXISTS;
+ using ::isfinite _LIBCPP_USING_IF_EXISTS;
+ using ::isgreater _LIBCPP_USING_IF_EXISTS;
+ using ::isgreaterequal _LIBCPP_USING_IF_EXISTS;
+ using ::isinf _LIBCPP_USING_IF_EXISTS;
+ using ::isless _LIBCPP_USING_IF_EXISTS;
+ using ::islessequal _LIBCPP_USING_IF_EXISTS;
+ using ::islessgreater _LIBCPP_USING_IF_EXISTS;
+ using ::isnan _LIBCPP_USING_IF_EXISTS;
+ using ::isnormal _LIBCPP_USING_IF_EXISTS;
+ using ::isunordered _LIBCPP_USING_IF_EXISTS;
+ using ::signbit _LIBCPP_USING_IF_EXISTS;
// [sf.cmath], mathematical special functions
} // export
diff --git a/libcxx/modules/std.compat/csetjmp.inc b/libcxx/modules/std.compat/csetjmp.inc
index 1fc42ea3ee0378..53e1421a2fbdd0 100644
--- a/libcxx/modules/std.compat/csetjmp.inc
+++ b/libcxx/modules/std.compat/csetjmp.inc
@@ -8,6 +8,6 @@
//===----------------------------------------------------------------------===//
export {
- using ::jmp_buf;
- using ::longjmp;
+ using ::jmp_buf _LIBCPP_USING_IF_EXISTS;
+ using ::longjmp _LIBCPP_USING_IF_EXISTS;
} // export
diff --git a/libcxx/modules/std.compat/csignal.inc b/libcxx/modules/std.compat/csignal.inc
index 33af6a9f2b7343..bf72459df16535 100644
--- a/libcxx/modules/std.compat/csignal.inc
+++ b/libcxx/modules/std.compat/csignal.inc
@@ -8,10 +8,10 @@
//===----------------------------------------------------------------------===//
export {
- using ::sig_atomic_t;
+ using ::sig_atomic_t _LIBCPP_USING_IF_EXISTS;
// [support.signal], signal handlers
- using ::signal;
+ using ::signal _LIBCPP_USING_IF_EXISTS;
- using ::raise;
+ using ::raise _LIBCPP_USING_IF_EXISTS;
} // export
diff --git a/libcxx/modules/std.compat/cstdarg.inc b/libcxx/modules/std.compat/cstdarg.inc
index 3efb34617a8bff..79b5df4ec99ced 100644
--- a/libcxx/modules/std.compat/cstdarg.inc
+++ b/libcxx/modules/std.compat/cstdarg.inc
@@ -7,4 +7,4 @@
//
//===----------------------------------------------------------------------===//
-export { using ::va_list; } // export
+export { using ::va_list _LIBCPP_USING_IF_EXISTS; } // export
diff --git a/libcxx/modules/std.compat/cstddef.inc b/libcxx/modules/std.compat/cstddef.inc
index 94ad036fd8f4a5..8704a31e01f326 100644
--- a/libcxx/modules/std.compat/cstddef.inc
+++ b/libcxx/modules/std.compat/cstddef.inc
@@ -8,10 +8,10 @@
//===----------------------------------------------------------------------===//
export {
- using ::max_align_t;
+ using ::max_align_t _LIBCPP_USING_IF_EXISTS;
using ::nullptr_t;
- using ::ptrdiff_t;
- using ::size_t;
+ using ::ptrdiff_t _LIBCPP_USING_IF_EXISTS;
+ using ::size_t _LIBCPP_USING_IF_EXISTS;
// [support.c.headers]/1
// ... placed within the global namespace scope, except for ... the
diff --git a/libcxx/modules/std.compat/cstdint.inc b/libcxx/modules/std.compat/cstdint.inc
index 1a74efc70ceaa1..a8dd6898cb266f 100644
--- a/libcxx/modules/std.compat/cstdint.inc
+++ b/libcxx/modules/std.compat/cstdint.inc
@@ -14,17 +14,17 @@ export {
using ::int32_t _LIBCPP_USING_IF_EXISTS;
using ::int64_t _LIBCPP_USING_IF_EXISTS;
- using ::int_fast16_t;
- using ::int_fast32_t;
- using ::int_fast64_t;
- using ::int_fast8_t;
+ using ::int_fast16_t _LIBCPP_USING_IF_EXISTS;
+ using ::int_fast32_t _LIBCPP_USING_IF_EXISTS;
+ using ::int_fast64_t _LIBCPP_USING_IF_EXISTS;
+ using ::int_fast8_t _LIBCPP_USING_IF_EXISTS;
- using ::int_least16_t;
- using ::int_least32_t;
- using ::int_least64_t;
- using ::int_least8_t;
+ using ::int_least16_t _LIBCPP_USING_IF_EXISTS;
+ using ::int_least32_t _LIBCPP_USING_IF_EXISTS;
+ using ::int_least64_t _LIBCPP_USING_IF_EXISTS;
+ using ::int_least8_t _LIBCPP_USING_IF_EXISTS;
- using ::intmax_t;
+ using ::intmax_t _LIBCPP_USING_IF_EXISTS;
using ::intptr_t _LIBCPP_USING_IF_EXISTS;
@@ -34,17 +34,17 @@ export {
using ::uint32_t _LIBCPP_USING_IF_EXISTS;
using ::uint64_t _LIBCPP_USING_IF_EXISTS;
- using ::uint_fast16_t;
- using ::uint_fast32_t;
- using ::uint_fast64_t;
- using ::uint_fast8_t;
+ using ::uint_fast16_t _LIBCPP_USING_IF_EXISTS;
+ using ::uint_fast32_t _LIBCPP_USING_IF_EXISTS;
+ using ::uint_fast64_t _LIBCPP_USING_IF_EXISTS;
+ using ::uint_fast8_t _LIBCPP_USING_IF_EXISTS;
- using ::uint_least16_t;
- using ::uint_least32_t;
- using ::uint_least64_t;
- using ::uint_least8_t;
+ using ::uint_least16_t _LIBCPP_USING_IF_EXISTS;
+ using ::uint_least32_t _LIBCPP_USING_IF_EXISTS;
+ using ::uint_least64_t _LIBCPP_USING_IF_EXISTS;
+ using ::uint_least8_t _LIBCPP_USING_IF_EXISTS;
- using ::uintmax_t;
+ using ::uintmax_t _LIBCPP_USING_IF_EXISTS;
using ::uintptr_t _LIBCPP_USING_IF_EXISTS;
} // export
diff --git a/libcxx/modules/std.compat/cstdio.inc b/libcxx/modules/std.compat/cstdio.inc
index 1ec3015c9e2a2e..33dd2cbfb0d7c3 100644
--- a/libcxx/modules/std.compat/cstdio.inc
+++ b/libcxx/modules/std.compat/cstdio.inc
@@ -8,54 +8,54...
[truncated]
|
philnik777
reviewed
Apr 29, 2024
mordante
force-pushed
the
review/modules_using_if_exists
branch
from
fa825b4 to
fa60b62
Compare
ldionne
approved these changes
May 2, 2024
This attribute is used in the headers. Not using this in the modules has led to several issues. Add them to the modules to avoid these errors in other placed.
mordante
force-pushed
the
review/modules_using_if_exists
branch
from
fa60b62 to
36aa588
Compare
If they're not needed without modules, then I suspect this is just papering over the root cause of the breakages. |
We've discussed this privately. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This attribute is used in the headers. Not using this in the modules has led to several issues. Add them to the modules to avoid these errors in other placed.