fix small merge conflicts

exo-lang · Oct 3, 2024 · d8258c5 · d8258c5
1 parent a56b737
commit d8258c5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/exo/boundscheck.py b/src/exo/boundscheck.py
@@ -1117,7 +1117,7 @@ def eff_e(self, e, type_env):
             return eff_null(e.srcinfo)
         elif isinstance(e, LoopIR.WindowExpr):
             return eff_null(e.srcinfo)
-        elif isinstance(e, LoopIR.BuiltIn):
+        elif isinstance(e, LoopIR.Extern):
             return eff_null(e.srcinfo)
         elif isinstance(e, LoopIR.StrideExpr):
             return eff_null(e.srcinfo)

diff --git a/src/exo/typecheck.py b/src/exo/typecheck.py
@@ -6,7 +6,6 @@
     get_writeconfigs,
     get_loop_iters,
 )
-from .builtins import BuiltIn_Typecheck_Error
 from .extern import Extern_Typecheck_Error
 from .memory import *