Fix an issue causing us to hit the interpreter when converting OneOf('someString', 'someOtherString') to str.

Author: braxtonmckee

typed_python/compiler/python_to_native_converter.py

@@ -957,8 +957,6 @@ def _installInflightFunctions(self, name):
                         outboundTargets
                     )
 
-
-
             if identifier not in self._inflight_definitions:
                 raise Exception(
                     f"Expected a definition for {identifier} depended on by:\n"

typed_python/compiler/tests/one_of_compilation_test.py

@@ -717,3 +717,10 @@ def checkIt(x: OneOf(None, Tuple(str, str))):
 
         assert checkIt(('a', 'b')) == 'ab'
         assert checkIt(None) == 'empty'
+
+    def test_convert_one_of_constants_to_string(self):
+        @Entrypoint
+        def toString(x: OneOf("hi", "bye")):  # noqa
+            return f"its: {x}"
+
+        toString('hi')

typed_python/compiler/tests/string_compilation_test.py

@@ -15,6 +15,7 @@
 import pytest
 import unittest
 import time
+import os
 
 from flaky import flaky
 from typed_python import _types, ListOf, TupleOf, Dict, ConstDict, Compiled, Entrypoint, OneOf
@@ -23,7 +24,7 @@
     strEndswith, strRangeEndswith, strEndswithTuple, strRangeEndswithTuple, \
     strReplace, strPartition, strRpartition, strCenter, strRjust, strLjust, strExpandtabs, strZfill
 from typed_python.test_util import currentMemUsageMb, compilerPerformanceComparison
-from typed_python.compiler.runtime import PrintNewFunctionVisitor
+from typed_python.compiler.runtime import PrintNewFunctionVisitor, RuntimeEventVisitor
 
 
 someStrings = [
@@ -1445,3 +1446,42 @@ def test_string_internal_fns(self):
         self.assertEqual(strExpandtabs(v, 8), v.expandtabs(8))
         self.assertEqual(strZfill(v, 20), v.zfill(20))
         self.assertEqual(strZfill('+123', 20), '+123'.zfill(20))
+
+    def test_fstring_of_string_doesnt_hit_interpreter(self):
+        # if the cache is on, this won't work
+        if os.getenv("TP_COMPILER_CACHE"):
+            return
+
+        class Visitor(RuntimeEventVisitor):
+            """Base class for a Visitor that gets to see what's going on in the runtime.
+
+            Clients should subclass this and pass it to 'addEventVisitor' in the runtime
+            to find out about events like function typing assignments.
+            """
+            def onNewFunction(
+                self,
+                identifier,
+                functionConverter,
+                nativeFunction,
+                funcName,
+                funcCode,
+                funcGlobals,
+                closureVars,
+                inputTypes,
+                outputType,
+                yieldType,
+                variableTypes,
+                conversionType,
+                calledFunctions,
+            ):
+                if funcName == "toString":
+                    self.nativeFunction = nativeFunction
+
+        @Entrypoint
+        def toString(x: OneOf("hi", "bye")):  # noqa
+            return f"its: {x}"
+
+        with Visitor() as vis:
+            toString("hi")
+
+        assert 'PythonObjectOfTypeWrapper' not in str(vis.nativeFunction)

typed_python/compiler/type_wrappers/string_wrapper.py

@@ -21,6 +21,7 @@
 from typed_python.compiler.type_wrappers.typed_list_masquerading_as_list_wrapper import TypedListMasqueradingAsList
 import typed_python.compiler.type_wrappers.runtime_functions as runtime_functions
 from typed_python.compiler.type_wrappers.bound_method_wrapper import BoundMethodWrapper
+from typed_python.compiler.conversion_level import ConversionLevel
 
 import typed_python.compiler.native_ast as native_ast
 import typed_python.compiler
@@ -1010,7 +1011,31 @@ def _can_convert_to_type(self, targetType, conversionLevel):
             Float32, Int8, Int16, Int32, UInt8, UInt16, UInt32, UInt64, float, int, bool, str
         )
 
+    def convert_to_self_with_target(self, context, targetVal, sourceVal, level: ConversionLevel, mayThrowOnFailure=False):
+        if sourceVal.expr_type.typeRepresentation is str:
+            targetVal.convert_copy_initialize(targetVal)
+            return context.constant(True)
+
+        if level.isNewOrHigher():
+            if not sourceVal.isReference:
+                sourceVal = context.pushMove(sourceVal)
+
+            return context.pushPod(
+                bool,
+                runtime_functions.np_try_pyobj_to_str.call(
+                    sourceVal.expr.cast(VoidPtr),
+                    targetVal.expr.cast(VoidPtr),
+                    context.getTypePointer(sourceVal.expr_type.typeRepresentation)
+                )
+            )
+
+        return super().convert_to_self_with_target(context, targetVal, sourceVal, level, mayThrowOnFailure)
+
     def convert_to_type_with_target(self, context, instance, targetVal, conversionLevel, mayThrowOnFailure=False):
+        if targetVal.expr_type.typeRepresentation is str:
+            targetVal.convert_copy_initialize(instance)
+            return context.constant(True)
+
         if not conversionLevel.isNewOrHigher():
             return super().convert_to_type_with_target(context, instance, targetVal, conversionLevel, mayThrowOnFailure)
 

typed_python/compiler/type_wrappers/wrapper.py

@@ -665,21 +665,6 @@ def convert_to_type_with_target(self, context, expr, targetVal, level: Conversio
         assert isinstance(level, ConversionLevel)
         assert targetVal.isReference
 
-        if level.isNewOrHigher() and targetVal.expr_type.typeRepresentation is str:
-            if not expr.isReference:
-                expr = context.pushMove(expr)
-
-            expr = expr.convert_to_type(object, ConversionLevel.Signature)
-
-            return context.pushPod(
-                bool,
-                runtime_functions.np_try_pyobj_to_str.call(
-                    expr.expr.cast(VoidPtr),
-                    targetVal.expr.cast(VoidPtr),
-                    context.getTypePointer(expr.expr_type.typeRepresentation)
-                )
-            )
-
         return targetVal.expr_type.convert_to_self_with_target(context, targetVal, expr, level, mayThrowOnFailure)
 
     def convert_to_self_with_target(self, context, targetVal, sourceVal, level: ConversionLevel, mayThrowOnFailure=False):