Skip to content
  • David Blaikie's avatar
    [opaque pointer type] Add textual IR support for explicit type parameter to the call instruction · 23af6484
    David Blaikie authored
    See r230786 and r230794 for similar changes to gep and load
    respectively.
    
    Call is a bit different because it often doesn't have a single explicit
    type - usually the type is deduced from the arguments, and just the
    return type is explicit. In those cases there's no need to change the
    IR.
    
    When that's not the case, the IR usually contains the pointer type of
    the first operand - but since typed pointers are going away, that
    representation is insufficient so I'm just stripping the "pointerness"
    of the explicit type away.
    
    This does make the IR a bit weird - it /sort of/ reads like the type of
    the first operand: "call void () %x(" but %x is actually of type "void
    ()*" and will eventually be just of type "ptr". But this seems not too
    bad and I don't think it would benefit from repeating the type
    ("void (), void () * %x(" and then eventually "void (), ptr %x(") as has
    been done with gep and load.
    
    This also has a side benefit: since the explicit type is no longer a
    pointer, there's no ambiguity between an explicit type and a function
    that returns a function pointer. Previously this case needed an explicit
    type (eg: a function returning a void() function was written as
    "call void () () * @x(" rather than "call void () * @x(" because of the
    ambiguity between a function returning a pointer to a void() function
    and a function returning void).
    
    No ambiguity means even function pointer return types can just be
    written alone, without writing the whole function's type.
    
    This leaves /only/ the varargs case where the explicit type is required.
    
    Given the special type syntax in call instructions, the regex-fu used
    for migration was a bit more involved in its own unique way (as every
    one of these is) so here it is. Use it in conjunction with the apply.sh
    script and associated find/xargs commands I've provided in rr230786 to
    migrate your out of tree tests. Do let me know if any of this doesn't
    cover your cases & we can iterate on a more general script/regexes to
    help others with out of tree tests.
    
    About 9 test cases couldn't be automatically migrated - half of those
    were functions returning function pointers, where I just had to manually
    delete the function argument types now that we didn't need an explicit
    function type there. The other half were typedefs of function types used
    in calls - just had to manually drop the * from those.
    
    import fileinput
    import sys
    import re
    
    pat = re.compile(r'((?:=|:|^|\s)call\s(?:[^@]*?))(\s*$|\s*(?:(?:\[\[[a-zA-Z0-9_]+\]\]|[@%](?:(")?[\\\?@a-zA-Z0-9_.]*?(?(3)"|)|{{.*}}))(?:\(|$)|undef|inttoptr|bitcast|null|asm).*$)')
    addrspace_end = re.compile(r"addrspace\(\d+\)\s*\*$")
    func_end = re.compile("(?:void.*|\)\s*)\*$")
    
    def conv(match, line):
      if not match or re.search(addrspace_end, match.group(1)) or not re.search(func_end, match.group(1)):
        return line
      return line[:match.start()] + match.group(1)[:match.group(1).rfind('*')].rstrip() + match.group(2) + line[match.end():]
    
    for line in sys.stdin:
      sys.stdout.write(conv(re.search(pat, line), line))
    
    llvm-svn: 235145
    23af6484
Loading