Skip to content

Revert "Add support for 32-bit reflection contexts." #3609

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.

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

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Dec 1, 2021

@compnerd
Copy link
Member Author

compnerd commented Dec 1, 2021

@swift-ci please test

@compnerd
Copy link
Member Author

compnerd commented Dec 1, 2021

CC: @JDevlieghere @adrian-prantl

@adrian-prantl
Copy link

Ah thanks. MSVC at work again. I'll see if I can figure out what it's unhappy about.

@adrian-prantl
Copy link

@compnerd
If I have to make a wild guess, this patch might fix it:

diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeImpl.h b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeImpl.h
index 711c36941495..93e66b0892f1 100644
--- a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeImpl.h
+++ b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeImpl.h
@@ -210,7 +210,7 @@ public:
     virtual bool addImage(
         llvm::function_ref<std::pair<swift::remote::RemoteRef<void>, uint64_t>(
             swift::ReflectionSectionKind)>
-            find_section);
+            find_section) = 0;
     virtual bool addImage(swift::remote::RemoteAddress image_start) = 0;
     virtual bool readELF(swift::remote::RemoteAddress ImageStart,
                          llvm::Optional<llvm::sys::MemoryBlock> FileBuffer) = 0;

@compnerd
Copy link
Member Author

compnerd commented Dec 1, 2021

Could you put up a PR with that? It should be easy to trigger a cross-repo test to quickly verify.

@adrian-prantl
Copy link

Github doesn't let me create new PRs right now, but I'd give that a try before reverting the patch.

@adrian-prantl
Copy link

I'll ping here as soon as it's possible again.

@compnerd
Copy link
Member Author

compnerd commented Dec 1, 2021

Actually, I quickly tested locally, you're right, that does fix it. Let's get that in ASAP.

@adrian-prantl
Copy link

#3611

@adrian-prantl adrian-prantl self-requested a review December 1, 2021 23:25
Copy link

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

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

@compnerd compnerd closed this Dec 2, 2021
@compnerd compnerd deleted the revert-3590-83959667 branch December 2, 2021 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants