[Backport release/3.1.x] chore(patches): fix ldoc intermittent fail caused by LuaJIT #12147
Conversation
This file contains 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
(cherry picked from commit c7c44a2)
bungle
requested changes
Dec 14, 2023
There was a problem hiding this comment.
@zhongweiy this seems to fail even worse:
can't find file to patch at input line 15
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 65c849390702b1150d52e64db86cbc6b3c98413e Mon Sep 17 00:00:00 2001
|From: Mike Pall <mike>
|Date: Thu, 9 Nov 2023 11:02:36 +0100
|Subject: [PATCH] Invalidate SCEV entry when returning to lower frame.
|
|Thanks to Zhongwei Yao. #1115
|---
| src/lj_record.c | 1 +
| 1 file changed, 1 insertion(+)
|
|diff --git a/bundle/LuaJIT-2.1-20230410/src/lj_record.c b/bundle/LuaJIT-2.1-20230410/src/lj_record.c
|index a49f942a..0122105b 100644
|--- a/bundle/LuaJIT-2.1-20230410/src/lj_record.c
|+++ b/bundle/LuaJIT-2.1-20230410/src/lj_record.c
--------------------------
File to patch:
|
@bungle I have not updated this branch at all. @AndyZhang0707 Hi, Andy, I remember 3.1 is deprecated. Shall I abandon this one? |
|
confirmed with Andy offline. This backporting is not needed. |
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.
Backport c7c44a2 from #11983.
Fix #KAG-1761