-
Notifications
You must be signed in to change notification settings - Fork 14
Remove #willJumpIfFalse #65
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
Conversation
|
The error does not seems related to my PR |
|
Was it recently added to Debugging-Core? Because, if Pharo let me create it, it means it didn't exist in Debugger-Core, right? |
|
It has been there for a while I think. At least some months. Pharo does not prevent to override existing methods, that’s what is happening each time we update a method. So extensions can replace existing methods but we end up in a dirty state |
|
How did you detect the clash? There is only one usage, in the Flashback Decompiler. |
|
Errors are unrelated but are scary: "could not resolve baseline of Sindarin"? |
it's ok, it will be resolved once #61 is merged, I think |
I detected the clash while doing a "recalculate dirty packages" on the Pharo repository. We currently have two clashes and this one is one of them. Here is the version in the Pharo repository: https://github.com/pharo-project/pharo/blob/Pharo12/src/Debugging-Core/InstructionStream.extension.st#L130 I prioritized keeping the one that is in Debbugging-Core but if you think there is a better solution I'm also open to it. I'd just like to avoid clashes of methods in the base image of Pharo |
|
No you are right, the original one should be kept. I will fix the baseline problem then merge this PR. |
|
eeeh just a question: that is going to Pharo 11 ? |
|
Well, tests don't pass because of the removed method. It doesn't find the other one |
|
It should not break P11 I think but if we can keep it for p12 it would be nice since the release is for this week :) |
Hum... This is weird because it's present in Pharo (cf link I provided just before) |
|
I think the other PR I just merged went to P11 :/ |
No, it's not. It has been merged into master. To merge it into Pharo12, we should create a branch Pharo-12, merge master into Pharo-12, and change the baseline of NewTools to load the Pharo12 branch |
|
Ah! Nice, so no impact? We can continue merging on master? |
yes we can |
|
My guess is that the problem is this:
So, merging this should be fine. |
|
It looks correct. What I can do is merge this into the master branch as it has no direct effect on Pharo. (Pharo11 and 12 loads the Pharo-11 branch). And then I can run another CI on the master branch and it should be green |
#willJumpIfFalse is already a method present un Debbuging-Core in Pharo.
This method creates a clash with the one already in Pharo and need to be removed.