[Truffle] Sprintf check for too many args when $DEBUG is true #4380
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
eregon
reviewed
Dec 13, 2016
| @@ -255,6 +264,13 @@ public PrintfSimpleParser(char[] source, Object[] arguments) { | |||
| } | |||
| } | |||
| } | |||
| if((argType == ArgType.UNNUMBERED || argType == ArgType.NONE) && | |||
| arguments.length > argCount ){ | |||
| if(isDebug){ | |||
There was a problem hiding this comment.
The spacing around here looks inconsistent with the rest.
eregon
reviewed
Dec 13, 2016
| } catch (InvalidFormatException e) { | ||
| throw new RaiseException(coreExceptions().argumentError(e.getMessage(), this)); | ||
| } | ||
| } | ||
|
|
||
| protected boolean isDebug(VirtualFrame frame) { |
There was a problem hiding this comment.
This should use a BooleanCastNode, using UnexpectedResultException directly is usually bad style.
MRI behaves with $DEBUG as 42 the same as true, and with nil the same as false.
eregon
reviewed
Dec 13, 2016
| @@ -1774,18 +1776,25 @@ public static long sleepFor(Node currentNode, RubyContext context, final long du | |||
|
|
|||
| @Child private RopeNodes.MakeLeafRopeNode makeLeafRopeNode; | |||
| @Child private TaintNode taintNode; | |||
| @Child private ReadGlobalVariableNode readDebugGlobalNode; | |||
There was a problem hiding this comment.
BooleanCastNodeGen.create(ReadGlobalVariableNodeGen.create("$DEBUG"));looks like a good way.
You need to remove the context and section from ReadGlobalVariableNode's constructor, which are not used anyway.
|
Looks good overall! |
bjfish
force-pushed
the
truffle-sprintf-debug-arg-check
branch
from
1c9c38e
to
e57a242
Compare
bjfish
force-pushed
the
truffle-sprintf-debug-arg-check
branch
from
e57a242
to
b21ffa5
Compare
bjfish
commented
Dec 13, 2016
| } catch (InvalidFormatException e) { | ||
| throw new RaiseException(coreExceptions().argumentError(e.getMessage(), this)); | ||
| } | ||
| } | ||
|
|
||
| protected boolean isDebug(VirtualFrame frame) { | ||
| try { | ||
| return readDebugGlobalNode.executeBoolean(frame); |
There was a problem hiding this comment.
What's the right node/way equivalent of RTEST(ruby_debug) ?
There was a problem hiding this comment.
BooleanCastNode. executeBoolean(frame, value).
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.
Opening PR for feedback