Update to Java commit 48e3292 (2022.06.29): CLJ-2712: Revert "fix AOT bug preventing overriding of clojure.core functions" -- missed this one

Author: dmiller

Clojure/Clojure/CljCompiler/Ast/DefExpr.cs

@@ -38,9 +38,6 @@ public class DefExpr : Expr
         readonly bool _isDynamic;
         public bool IsDynamic { get { return _isDynamic; } }
 
-        readonly bool _shadowsCoreMapping;
-        public bool ShadowsCoreMapping { get { return _shadowsCoreMapping; } }
-        
         readonly string _source;
         public string Source { get { return _source; } }
 
@@ -54,7 +51,7 @@ public class DefExpr : Expr
 
         #region Ctors
 
-        public DefExpr(string source, int line, int column, Var var, Expr init, Expr meta, bool initProvided, bool isDyanamic, bool shadowsCoreMapping)
+        public DefExpr(string source, int line, int column, Var var, Expr init, Expr meta, bool initProvided, bool isDyanamic)
         {
             _source = source;
             _line = line;
@@ -63,7 +60,6 @@ public DefExpr(string source, int line, int column, Var var, Expr init, Expr met
             _init = init;
             _meta = meta;
             _isDynamic = isDyanamic;
-            _shadowsCoreMapping = shadowsCoreMapping;
             _initProvided = initProvided;
         }
 
@@ -115,14 +111,11 @@ public Expr Parse(ParserContext pcon, object form)
                 if (v == null)
                     throw new ParseException("Can't refer to qualified var that doesn't exist");
 
-                bool shadowsCoreMapping = false;
-
                 if (!v.Namespace.Equals(Compiler.CurrentNamespace))
                 {
                     if (sym.Namespace == null)
                     {
                         v = Compiler.CurrentNamespace.intern(sym);
-                        shadowsCoreMapping = true;
                         Compiler.RegisterVar(v);
                     }
 
@@ -183,7 +176,7 @@ public Expr Parse(ParserContext pcon, object form)
                     (string)Compiler.SourceVar.deref(),
                     Compiler.LineVarDeref(),
                     Compiler.ColumnVarDeref(),
-                    v, init, meta, initProvided,isDynamic,shadowsCoreMapping);
+                    v, init, meta, initProvided,isDynamic);
             }
         }
 
@@ -226,27 +219,6 @@ public void Emit(RHC rhc, ObjExpr objx, CljILGen ilg)
         {
             objx.EmitVar(ilg, _var);
 
-            if ( _shadowsCoreMapping )
-            {
-                LocalBuilder locNs = ilg.DeclareLocal(typeof(Namespace));
-                GenContext.SetLocalName(locNs, "ns");
-
-                ilg.Emit(OpCodes.Dup);
-                ilg.EmitFieldGet(VarNsFI);
-                ilg.Emit(OpCodes.Stloc,locNs);
-
-                LocalBuilder locSym = ilg.DeclareLocal(typeof(Symbol));
-                GenContext.SetLocalName(locSym, "sym");
-
-                ilg.Emit(OpCodes.Dup);
-                ilg.EmitFieldGet(VarSymFI);
-                ilg.Emit(OpCodes.Stloc, locSym);
-
-                ilg.Emit(OpCodes.Ldloc, locNs);
-                ilg.Emit(OpCodes.Ldloc, locSym);
-                ilg.Emit(OpCodes.Call, NamespaceReferMI);
-            }
-
             if (_isDynamic)
             {
                 ilg.Emit(OpCodes.Call, Compiler.Method_Var_setDynamic0);