codegen+runtime: Work around AK's is<T>(U) refusing to work if T == U

SerenityOS · Oct 3, 2024 · d1fb6cc · d1fb6cc
1 parent 17da9d0
commit d1fb6cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/runtime/lib.h b/runtime/lib.h
@@ -395,6 +395,16 @@ T fail_comptime_call()
     return declval<T>();
 }
 
+template<typename T, typename U>
+constexpr static bool lenient_is(U value)
+{
+    using NonRef = RemoveCVReference<U>;
+    if constexpr (IsSame<NonRef, T> || IsSame<NonRef, NonnullRefPtr<T>> || IsSame<NonRef, RefPtr<T>>)
+        return true;
+    else
+        return Jakt::is<T>(forward<U>(value));
+}
+
 template<typename T>
 using UnderlyingClassTypeOf = typename Detail::UnderlyingClassTypeOf<RemoveCVReference<T>>::Type;
 }

diff --git a/selfhost/codegen.jakt b/selfhost/codegen.jakt
@@ -2940,8 +2940,6 @@ struct CodeGenerator {
                 })
             }
             UnaryOp(expr, op, type_id) => {
-
-
                 match op {
                     PreIncrement    => .codegen_prefix_unary(expr, cpp_operator: "++", output, syntactically_self_contained)
                     PreDecrement    => .codegen_prefix_unary(expr, cpp_operator: "--", output, syntactically_self_contained)
@@ -2980,7 +2978,7 @@ struct CodeGenerator {
                             }
                             else => .codegen_type(type_id)
                         }
-                        output.appendff("is<{}>(", is_type)
+                        output.appendff("JaktInternal::lenient_is<{}>(", is_type)
                         .codegen_expression(expr, output)
                         output.append(')')
                     }
@@ -3754,7 +3752,7 @@ struct CodeGenerator {
                 }
             }
             ClassInstance(type: type_id) => {
-                output.appendff("is<{}>(__jakt_enum_value.ptr())", .codegen_type_possibly_as_namespace(type_id, as_namespace: true))
+                output.appendff("JaktInternal::lenient_is<{}>(__jakt_enum_value.ptr())", .codegen_type_possibly_as_namespace(type_id, as_namespace: true))
             }
             CatchAll => { .compiler.panic("catch all has no condition, should be emitted separately") }
         }