Skip to content

Make cling build again on Windows (following the recent changes). To … #653

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
bellenot wants to merge 1 commit into from
Closed

Make cling build again on Windows (following the recent changes). To … #653

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
3 changes: 2 additions & 1 deletion interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ class Azog: public RTDyldMemoryManager {

void deregisterEHFrames() override {
#ifdef LLVM_ON_WIN32
platform::DeRegisterEHFrames(Addr, Size);
// platform::DeRegisterEHFrames(Addr, Size);
Copy link
Member Author

@bellenot bellenot Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marsupial : to be reviewed...

Copy link
Member

@vgvassilev vgvassilev Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marsupial, should I bring back the arguments of deregisterEHFrames or we could update platform::DeRegisterEHFrames's signature?

Copy link
Contributor

@marsupial marsupial Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this is doing.
If exception handling on X64 broke because of the LLVM upgrade it should be fixed.
If exception handling on X86 still isn't implemented, disabling for X64 doesn't seem like a solution.

Copy link
Member

@Axel-Naumann Axel-Naumann Jun 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vgvassilev I don't understand the asymmetry between registerEHFrames and deregisterEHFrames. MemoryManager has args to both, RuntimeDyld has args to none, we have args to one and call it override? Could you have a look, please?

Copy link
Contributor

@marsupial marsupial Jun 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe RTDyldMemoryManager has args to a static helper function (for Unix) that the instance method (which is without args call too).

I've pushed the relevant changes for Win64 exceptions here: root-project/cling#164, and hid the code behind a CLING_WIN_SEH_EXCEPTIONS macro until you are ready to turn it on.

Copy link
Member Author

@bellenot bellenot Jun 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @marsupial !

llvm_unreachable("Not implemented yet");
#else
return getExeMM()->deregisterEHFrames();
#endif
Expand Down
1 change: 0 additions & 1 deletion interpreter/cling/tools/driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ if(MSVC)
?write@raw_ostream@llvm@@QEAAAEAV12@PEBD_K@Z
?castFromDeclContext@Decl@clang@@SAPEAV12@PEBVDeclContext@2@@Z
??1raw_ostream@llvm@@UEAA@XZ
?dump@Decl@clang@@QEBAXAEAVraw_ostream@llvm@@@Z
??1raw_string_ostream@llvm@@UEAA@XZ
?flush_nonempty@raw_ostream@llvm@@AEAAXXZ
?getASTContext@Decl@clang@@QEBAAEAVASTContext@2@XZ
Expand Down