Fix an issue causing us to hit the interpreter when converting OneOf(… · APrioriInvestments/typed_python@d600a02 · GitHub
Skip to content

Commit d600a02

Browse files
braxtonmckeewllgrnt
braxtonmckee
authored and
wllgrnt
committed
Fix an issue causing us to hit the interpreter when converting OneOf('someString', 'someOtherString') to str.
1 parent 14ebced commit d600a02

5 files changed

Lines changed: 73 additions & 18 deletions

File tree

‎typed_python/compiler/python_to_native_converter.py‎

Lines changed: 0 additions & 2 deletions

‎typed_python/compiler/tests/one_of_compilation_test.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,3 +766,10 @@ def checkIt(x: OneOf(None, Tuple(str, str))):
766766

767767
assert checkIt(('a', 'b')) == 'ab'
768768
assert checkIt(None) == 'empty'
769+
770+
def test_convert_one_of_constants_to_string(self):
771+
@Entrypoint
772+
def toString(x: OneOf("hi", "bye")): # noqa
773+
return f"its: {x}"
774+
775+
toString('hi')

‎typed_python/compiler/tests/string_compilation_test.py‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import pytest
1616
import unittest
1717
import time
18+
import os
1819

1920
from flaky import flaky
2021
from typed_python import _types, ListOf, TupleOf, Dict, ConstDict, Compiled, Entrypoint, OneOf
@@ -23,7 +24,7 @@
2324
strEndswith, strRangeEndswith, strEndswithTuple, strRangeEndswithTuple, \
2425
strReplace, strPartition, strRpartition, strCenter, strRjust, strLjust, strExpandtabs, strZfill
2526
from typed_python.test_util import currentMemUsageMb, compilerPerformanceComparison
26-
from typed_python.compiler.runtime import PrintNewFunctionVisitor
27+
from typed_python.compiler.runtime import PrintNewFunctionVisitor, RuntimeEventVisitor
2728

2829

2930
someStrings = [
@@ -1500,3 +1501,42 @@ def test_string_internal_fns(self):
15001501
self.assertEqual(strExpandtabs(v, 8), v.expandtabs(8))
15011502
self.assertEqual(strZfill(v, 20), v.zfill(20))
15021503
self.assertEqual(strZfill('+123', 20), '+123'.zfill(20))
1504+
1505+
def test_fstring_of_string_doesnt_hit_interpreter(self):
1506+
# if the cache is on, this won't work
1507+
if os.getenv("TP_COMPILER_CACHE"):
1508+
return
1509+
1510+
class Visitor(RuntimeEventVisitor):
1511+
"""Base class for a Visitor that gets to see what's going on in the runtime.
1512+
1513+
Clients should subclass this and pass it to 'addEventVisitor' in the runtime
1514+
to find out about events like function typing assignments.
1515+
"""
1516+
def onNewFunction(
1517+
self,
1518+
identifier,
1519+
functionConverter,
1520+
nativeFunction,
1521+
funcName,
1522+
funcCode,
1523+
funcGlobals,
1524+
closureVars,
1525+
inputTypes,
1526+
outputType,
1527+
yieldType,
1528+
variableTypes,
1529+
conversionType,
1530+
calledFunctions,
1531+
):
1532+
if funcName == "toString":
1533+
self.nativeFunction = nativeFunction
1534+
1535+
@Entrypoint
1536+
def toString(x: OneOf("hi", "bye")): # noqa
1537+
return f"its: {x}"
1538+
1539+
with Visitor() as vis:
1540+
toString("hi")
1541+
1542+
assert 'PythonObjectOfTypeWrapper' not in str(vis.nativeFunction)

‎typed_python/compiler/type_wrappers/string_wrapper.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from typed_python.compiler.type_wrappers.typed_list_masquerading_as_list_wrapper import TypedListMasqueradingAsList
2222
import typed_python.compiler.type_wrappers.runtime_functions as runtime_functions
2323
from typed_python.compiler.type_wrappers.bound_method_wrapper import BoundMethodWrapper
24+
from typed_python.compiler.conversion_level import ConversionLevel
2425

2526
import typed_python.compiler.native_ast as native_ast
2627
import typed_python.compiler
@@ -1010,7 +1011,31 @@ def _can_convert_to_type(self, targetType, conversionLevel):
10101011
Float32, Int8, Int16, Int32, UInt8, UInt16, UInt32, UInt64, float, int, bool, str
10111012
)
10121013

1014+
def convert_to_self_with_target(self, context, targetVal, sourceVal, level: ConversionLevel, mayThrowOnFailure=False):
1015+
if sourceVal.expr_type.typeRepresentation is str:
1016+
targetVal.convert_copy_initialize(targetVal)
1017+
return context.constant(True)
1018+
1019+
if level.isNewOrHigher():
1020+
if not sourceVal.isReference:
1021+
sourceVal = context.pushMove(sourceVal)
1022+
1023+
return context.pushPod(
1024+
bool,
1025+
runtime_functions.np_try_pyobj_to_str.call(
1026+
sourceVal.expr.cast(VoidPtr),
1027+
targetVal.expr.cast(VoidPtr),
1028+
context.getTypePointer(sourceVal.expr_type.typeRepresentation)
1029+
)
1030+
)
1031+
1032+
return super().convert_to_self_with_target(context, targetVal, sourceVal, level, mayThrowOnFailure)
1033+
10131034
def convert_to_type_with_target(self, context, instance, targetVal, conversionLevel, mayThrowOnFailure=False):
1035+
if targetVal.expr_type.typeRepresentation is str:
1036+
targetVal.convert_copy_initialize(instance)
1037+
return context.constant(True)
1038+
10141039
if not conversionLevel.isNewOrHigher():
10151040
return super().convert_to_type_with_target(context, instance, targetVal, conversionLevel, mayThrowOnFailure)
10161041

‎typed_python/compiler/type_wrappers/wrapper.py‎

Lines changed: 0 additions & 15 deletions

0 commit comments

Comments
 (0)