update builtins.jl (#628)

Author: aviatesk

bin/generate_builtins.jl

@@ -11,9 +11,9 @@ const ALWAYS_PRESENT = Core.Builtin[
     applicable, fieldtype, getfield, invoke, isa, isdefined, nfields,
     setfield!, throw, tuple, typeassert, typeof
 ]
-# Builtins present in 1.6, not builtins (potentially still normal functions) anymore
+# Builtins present from 1.6, not builtins (potentially still normal functions) anymore
 const RECENTLY_REMOVED = GlobalRef.(Ref(Core), [
-    :arrayref, :arrayset, :arrayset, :const_arrayref,
+    :arrayref, :arrayset, :arrayset, :const_arrayref, :memoryref,
 ])
 const kwinvoke = Core.kwfunc(Core.invoke)
 
@@ -37,9 +37,9 @@ function nargs(f, table, id)
         minarg = 0
         maxarg = typemax(Int)
     end
-    # Specialize ~arrayref and arrayset~ memoryref for small numbers of arguments
+    # Specialize ~arrayref and arrayset~ memoryrefnew for small numbers of arguments
     # TODO: how about other memory intrinsics?
-    if f == Core.memoryref
+    if (@static isdefined(Core, :memoryrefnew) ? f == Core.memoryrefnew : f == Core.memoryref)
         maxarg = 5
     end
     return minarg, maxarg
@@ -268,7 +268,7 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
     # recently removed builtins
     for (; mod, name) in RECENTLY_REMOVED
         minarg = 1
-        if name in (:arrayref, :const_arrayref)
+        if name in (:arrayref, :const_arrayref, :memoryref)
             maxarg = 5
         elseif name === :arrayset
             maxarg = 6

src/builtins.jl

@@ -158,20 +158,6 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
         else
             return Some{Any}(Core.ifelse(getargs(args, frame)...))
         end
-    elseif @static isdefined(Core, :memoryref) && f === Core.memoryref
-        if nargs == 1
-            return Some{Any}(Core.memoryref(@lookup(frame, args[2])))
-        elseif nargs == 2
-            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3])))
-        elseif nargs == 3
-            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4])))
-        elseif nargs == 4
-            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4]), @lookup(frame, args[5])))
-        elseif nargs == 5
-            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4]), @lookup(frame, args[5]), @lookup(frame, args[6])))
-        else
-            return Some{Any}(Core.memoryref(getargs(args, frame)...))
-        end
     elseif @static isdefined(Core, :memoryref_isassigned) && f === Core.memoryref_isassigned
         if nargs == 3
             return Some{Any}(Core.memoryref_isassigned(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4])))
@@ -190,6 +176,20 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
         else
             return Some{Any}(Core.memoryrefmodify!(getargs(args, frame)...))
         end
+    elseif @static isdefined(Core, :memoryrefnew) && f === Core.memoryrefnew
+        if nargs == 1
+            return Some{Any}(Core.memoryrefnew(@lookup(frame, args[2])))
+        elseif nargs == 2
+            return Some{Any}(Core.memoryrefnew(@lookup(frame, args[2]), @lookup(frame, args[3])))
+        elseif nargs == 3
+            return Some{Any}(Core.memoryrefnew(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4])))
+        elseif nargs == 4
+            return Some{Any}(Core.memoryrefnew(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4]), @lookup(frame, args[5])))
+        elseif nargs == 5
+            return Some{Any}(Core.memoryrefnew(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4]), @lookup(frame, args[5]), @lookup(frame, args[6])))
+        else
+            return Some{Any}(Core.memoryrefnew(getargs(args, frame)...))
+        end
     elseif @static isdefined(Core, :memoryrefoffset) && f === Core.memoryrefoffset
         if nargs == 1
             return Some{Any}(Core.memoryrefoffset(@lookup(frame, args[2])))
@@ -468,6 +468,20 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
         else
             return Some{Any}(Core.const_arrayref(getargs(args, frame)...))
         end
+    elseif @static (isdefined(Core, :memoryref) && Core.memoryref isa Core.Builtin) && f === Core.memoryref
+        if nargs == 1
+            return Some{Any}(Core.memoryref(@lookup(frame, args[2])))
+        elseif nargs == 2
+            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3])))
+        elseif nargs == 3
+            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4])))
+        elseif nargs == 4
+            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4]), @lookup(frame, args[5])))
+        elseif nargs == 5
+            return Some{Any}(Core.memoryref(@lookup(frame, args[2]), @lookup(frame, args[3]), @lookup(frame, args[4]), @lookup(frame, args[5]), @lookup(frame, args[6])))
+        else
+            return Some{Any}(Core.memoryref(getargs(args, frame)...))
+        end
     elseif f === Core.Intrinsics.llvmcall
         return Some{Any}(Core.Intrinsics.llvmcall(getargs(args, frame)...))
     end