- 
          
- 
                Notifications
    You must be signed in to change notification settings 
- Fork 3k
          [mypyc] fix: builder crashes on 3-arg range(x, y, z) if step isnt foldable
          #20098
        
          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
          
     Open
      
      
            BobTheBuidler
  wants to merge
  11
  commits into
  python:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
BobTheBuidler:fix-3-arg-range
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
      
        
          +29
        
        
          −33
        
        
          
        
      
    
  
  
     Open
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            11 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      cf1470b
              
                [mypyc] fix: builder crashes on 3-arg range if step isnt foldable
              
              
                BobTheBuidler 2b0407b
              
                [pre-commit.ci] auto fixes from pre-commit.com hooks
              
              
                pre-commit-ci[bot] 9efe377
              
                Update for_helpers.py
              
              
                BobTheBuidler 1dbaa15
              
                Update for_helpers.py
              
              
                BobTheBuidler a266982
              
                Update for_helpers.py
              
              
                BobTheBuidler b5d519c
              
                Update commandline.test
              
              
                BobTheBuidler 4fda932
              
                Update commandline.test
              
              
                BobTheBuidler 3ad0bad
              
                Update for_helpers.py
              
              
                BobTheBuidler b1c9e3f
              
                Merge branch 'master' into fix-3-arg-range
              
              
                BobTheBuidler 0bb8e0e
              
                [pre-commit.ci] auto fixes from pre-commit.com hooks
              
              
                pre-commit-ci[bot] 57be7b8
              
                Update for_helpers.py
              
              
                BobTheBuidler File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or 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
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
|  | @@ -454,39 +454,35 @@ def make_for_loop_generator( | |
| return for_dict | ||
|  | ||
| if isinstance(expr, CallExpr) and isinstance(expr.callee, RefExpr): | ||
| if ( | ||
| is_range_ref(expr.callee) | ||
| and ( | ||
| len(expr.args) <= 2 | ||
| or (len(expr.args) == 3 and builder.extract_int(expr.args[2]) is not None) | ||
| ) | ||
| and set(expr.arg_kinds) == {ARG_POS} | ||
| ): | ||
| # Special case "for x in range(...)". | ||
| # We support the 3 arg form but only for int literals, since it doesn't | ||
| # seem worth the hassle of supporting dynamically determining which | ||
| # direction of comparison to do. | ||
| if len(expr.args) == 1: | ||
| start_reg: Value = Integer(0) | ||
| end_reg = builder.accept(expr.args[0]) | ||
| else: | ||
| start_reg = builder.accept(expr.args[0]) | ||
| end_reg = builder.accept(expr.args[1]) | ||
| if len(expr.args) == 3: | ||
| step = builder.extract_int(expr.args[2]) | ||
| assert step is not None | ||
| if step == 0: | ||
| There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we no longer need to check this because we validate that it isn't  | ||
| builder.error("range() step can't be zero", expr.args[2].line) | ||
| else: | ||
| step = 1 | ||
| num_args = len(expr.args) | ||
|  | ||
| for_range = ForRange(builder, index, body_block, loop_exit, line, nested) | ||
| for_range.init(start_reg, end_reg, step) | ||
| return for_range | ||
| if is_range_ref(expr.callee) and set(expr.arg_kinds) == {ARG_POS}: | ||
| # Special case "for x in range(...)". | ||
| # NOTE We support the 3 arg form but only when `step` is constant- | ||
| # foldable, since it doesn't seem worth the hassle of supporting | ||
| # dynamically determining which direction of comparison to do. | ||
| # If we cannot constant fold `step`, we just fallback to stdlib range. | ||
| if num_args <= 2 or (num_args == 3 and builder.extract_int(expr.args[2])): | ||
| if num_args == 1: | ||
| start_reg: Value = Integer(0) | ||
| end_reg = builder.accept(expr.args[0]) | ||
| step = 1 | ||
| else: | ||
| start_reg = builder.accept(expr.args[0]) | ||
| end_reg = builder.accept(expr.args[1]) | ||
| step_ = 1 if num_args == 2 else builder.extract_int(expr.args[2]) | ||
| assert isinstance( | ||
| step_, int | ||
| ), "this was validated above, the assert is for mypy" | ||
| step = step_ | ||
|  | ||
| for_range = ForRange(builder, index, body_block, loop_exit, line, nested) | ||
| for_range.init(start_reg, end_reg, step) | ||
| return for_range | ||
|  | ||
| elif ( | ||
| expr.callee.fullname == "builtins.enumerate" | ||
| and len(expr.args) == 1 | ||
| and num_args == 1 | ||
| and expr.arg_kinds == [ARG_POS] | ||
| and isinstance(index, TupleExpr) | ||
| and len(index.items) == 2 | ||
|  | @@ -500,10 +496,10 @@ def make_for_loop_generator( | |
|  | ||
| elif ( | ||
| expr.callee.fullname == "builtins.zip" | ||
| and len(expr.args) >= 2 | ||
| and num_args >= 2 | ||
| and set(expr.arg_kinds) == {ARG_POS} | ||
| and isinstance(index, TupleExpr) | ||
| and len(index.items) == len(expr.args) | ||
| and len(index.items) == num_args | ||
| ): | ||
| # Special case "for x, y in zip(a, b)". | ||
| for_zip = ForZip(builder, index, body_block, loop_exit, line, nested) | ||
|  | @@ -512,7 +508,7 @@ def make_for_loop_generator( | |
|  | ||
| if ( | ||
| expr.callee.fullname == "builtins.reversed" | ||
| and len(expr.args) == 1 | ||
| and num_args == 1 | ||
| and expr.arg_kinds == [ARG_POS] | ||
| and is_sequence_rprimitive(builder.node_type(expr.args[0])) | ||
| ): | ||
|  | ||
  
    
      This file contains hidden or 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
    
  
  
    
              
  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.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh, why did this fail with an assertion error? (I'm not used to mypyc...)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeh, I'm realizing while re-reading this that it doesn't
I discovered this assert when working on #20100 and made this PR as an intermediate step which could be merged in before the full feature.
In hindsight I suppose this is no longer necessary, but I'll leave it open so maintainers can decide if we want to merge it before #20100