Skip to content

As/sema prep 4 #284

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

Closed
yuri91 wants to merge 3 commits into from
Closed

As/sema prep 4 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78b5513
support disablig AS and attribute injection via #pragma cheerp env none
yuri91 Feb 23, 2024
480f74d
libcxx: cast `free` for indirect usage
yuri91 Jan 28, 2025
e41267a
libcxx: Make _Rep_base bytelayout only in genericjs mode
yuri91 Jan 9, 2025
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
2 changes: 1 addition & 1 deletion clang/include/clang/Sema/Sema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ class Sema final {

OpenCLOptions OpenCLFeatures;
FPOptions CurFPFeatures;
LangOptions::CheerpDefaultEnvMode CurCheerpEnv;
LangAS CurCheerpFallbackAS;

const LangOptions &LangOpts;
Preprocessor &PP;
Expand Down
8 changes: 7 additions & 1 deletion clang/lib/Sema/SemaAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,13 @@ void Sema::ActOnPragmaOptimize(bool On, SourceLocation PragmaLoc) {
}

void Sema::ActOnPragmaCheerpEnv(LangOptions::CheerpDefaultEnvMode Mode, SourceLocation PragmaLoc) {
CurCheerpEnv = Mode;
if (Mode == LangOptions::CheerpDefaultEnvMode::GenericJS) {
CurCheerpFallbackAS = LangAS::cheerp_genericjs;
} else if (Mode == LangOptions::CheerpDefaultEnvMode::Wasm) {
CurCheerpFallbackAS = LangAS::cheerp_wasm;
} else {
CurCheerpFallbackAS = LangAS::Default;
}
}

void Sema::ActOnPragmaMSOptimize(SourceLocation Loc, bool IsOn) {
Expand Down
4 changes: 2 additions & 2 deletions clang/lib/Sema/SemaCheerp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,9 @@ cheerp::CheerpAttributeToAdd cheerp::getCheerpAttributeToAdd(clang::Sema& S, con
}

// Or set default attr based on default
if (S.CurCheerpEnv == clang::LangOptions::Wasm)
if (S.CurCheerpFallbackAS == clang::LangAS::cheerp_wasm)
return CheerpAttributeToAdd::AsmJSLike;
else if (S.CurCheerpEnv == clang::LangOptions::GenericJS)
else if (S.CurCheerpFallbackAS == clang::LangAS::cheerp_genericjs)
return CheerpAttributeToAdd::GenericJS;
else
return CheerpAttributeToAdd::None;
Expand Down
8 changes: 8 additions & 0 deletions libcxx/include/locale
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ template <class charT> class messages_byname;
#include <streambuf>
#include <version>

#ifdef __CHEERP__
#define free reinterpret_cast<void(*)(void*)>(free)
#endif

#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
// Most unix variants have catopen. These are the specific ones that don't.
# if !defined(__BIONIC__) && !defined(_NEWLIB_VERSION) && !defined(__EMSCRIPTEN__)
Expand Down Expand Up @@ -4375,4 +4379,8 @@ _LIBCPP_POP_MACROS
# include <typeinfo>
#endif

#ifdef __CHEERP__
#undef free
#endif

#endif // _LIBCPP_LOCALE
6 changes: 5 additions & 1 deletion libcxx/include/stdexcept
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ public:
_LIBCPP_BEGIN_NAMESPACE_STD

typedef int count_t;
struct [[cheerp::bytelayout]] _Rep_base {
struct
#if defined(__CHEERP__) && !defined(__ASMJS__)
[[cheerp::bytelayout]]
#endif
_Rep_base {
std::size_t len;
std::size_t cap;
count_t count;
Expand Down
13 changes: 9 additions & 4 deletions libcxx/src/ios.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,20 @@ ios_base::init(void* sb)
::new(&__loc_) locale;
}

#ifdef __CHEERP__
#define indirectfree reinterpret_cast<void(*)(void*)>(free)
#else
#define indirectfree free
#endif
void
ios_base::copyfmt(const ios_base& rhs)
{
// If we can't acquire the needed resources, throw bad_alloc (can't set badbit)
// Don't alter *this until all needed resources are acquired
unique_ptr<event_callback, void (*)(void*)> new_callbacks(0, free);
unique_ptr<int, void (*)(void*)> new_ints(0, free);
unique_ptr<long, void (*)(void*)> new_longs(0, free);
unique_ptr<void*, void (*)(void*)> new_pointers(0, free);
unique_ptr<event_callback, void (*)(void*)> new_callbacks(0, indirectfree);
unique_ptr<int, void (*)(void*)> new_ints(0, indirectfree);
unique_ptr<long, void (*)(void*)> new_longs(0, indirectfree);
unique_ptr<void*, void (*)(void*)> new_pointers(0, indirectfree);
if (__event_cap_ < rhs.__event_size_)
{
size_t newesize = sizeof(event_callback) * rhs.__event_size_;
Expand Down
Loading