allow GlobalRef nodes in more places (mostly assignments)

part of JuliaLang#10403

Author: JeffBezanson

src/codegen.cpp

@@ -2873,14 +2873,18 @@ static void emit_assignment(jl_value_t *l, jl_value_t *r, jl_codectx_t *ctx)
         return;
     }
     jl_sym_t *s = NULL;
+    jl_binding_t *bnd=NULL;
+    Value *bp=NULL;
     if (jl_is_symbol(l))
         s = (jl_sym_t*)l;
     else if (jl_is_symbolnode(l))
         s = jl_symbolnode_sym(l);
+    else if (jl_is_globalref(l))
+        bp = global_binding_pointer(jl_globalref_mod(l), jl_globalref_name(l), &bnd, true);
     else
         assert(false);
-    jl_binding_t *bnd=NULL;
-    Value *bp = var_binding_pointer(s, &bnd, true, ctx);
+    if (bp == NULL)
+        bp = var_binding_pointer(s, &bnd, true, ctx);
     if (bnd) {
         Value *rval = boxed(emit_expr(r, ctx, true),ctx);
 #ifdef LLVM37
@@ -3096,8 +3100,8 @@ static Value *emit_expr(jl_value_t *expr, jl_codectx_t *ctx, bool isboxed,
         jl_value_t *mn = args[0];
         bool iskw = false;
         Value *theF = NULL;
-        if (jl_is_expr(mn)) {
-            if (((jl_expr_t*)mn)->head == kw_sym) {
+        if (jl_is_expr(mn) || jl_is_globalref(mn)) {
+            if (jl_is_expr(mn) && ((jl_expr_t*)mn)->head == kw_sym) {
                 iskw = true;
                 mn = jl_exprarg(mn,0);
             }

src/interpreter.c

@@ -221,20 +221,25 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ng
             if (genid >= ngensym || genid < 0)
                 jl_error("assignment to invalid GenSym location");
             locals[nl*2 + genid] = rhs;
-            gc_wb(jl_current_module, rhs); // not sure about jl_current_module
             return rhs;
         }
-        assert(jl_is_symbol(sym));
-        size_t i;
-        for (i=0; i < nl; i++) {
-            if (locals[i*2] == sym) {
-                locals[i*2+1] = rhs;
-                gc_wb(jl_current_module, rhs); // not sure about jl_current_module
-                return rhs;
+        if (jl_is_symbol(sym)) {
+            size_t i;
+            for (i=0; i < nl; i++) {
+                if (locals[i*2] == sym) {
+                    locals[i*2+1] = rhs;
+                    return rhs;
+                }
             }
         }
+        jl_module_t *m = jl_current_module;
+        if (jl_is_globalref(sym)) {
+            m = jl_globalref_mod(sym);
+            sym = jl_globalref_name(sym);
+        }
+        assert(jl_is_symbol(sym));
         JL_GC_PUSH1(&rhs);
-        jl_binding_t *b = jl_get_binding_wr(jl_current_module, (jl_sym_t*)sym);
+        jl_binding_t *b = jl_get_binding_wr(m, (jl_sym_t*)sym);
         jl_checked_assignment(b, rhs);
         JL_GC_POP();
         return rhs;
@@ -270,8 +275,8 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ng
         jl_binding_t *b=NULL;
         jl_value_t *gf=NULL;
         int kw=0;
-        if (jl_is_expr(fname)) {
-            if (((jl_expr_t*)fname)->head == kw_sym) {
+        if (jl_is_expr(fname) || jl_is_globalref(fname)) {
+            if (jl_is_expr(fname) && ((jl_expr_t*)fname)->head == kw_sym) {
                 kw = 1;
                 fname = (jl_sym_t*)jl_exprarg(fname, 0);
             }

src/toplevel.c

@@ -233,7 +233,8 @@ int jl_has_intrinsics(jl_expr_t *e, jl_module_t *m)
     jl_value_t *e0 = jl_exprarg(e,0);
     if (e->head == call_sym &&
         ((jl_is_symbol(e0) && is_intrinsic(m,(jl_sym_t*)e0)) ||
-         (jl_is_topnode(e0) && is_intrinsic(jl_base_relative_to(m),(jl_sym_t*)jl_fieldref(e0,0)))))
+         (jl_is_topnode(e0) && is_intrinsic(jl_base_relative_to(m),(jl_sym_t*)jl_fieldref(e0,0))) ||
+         (jl_is_globalref(e0) && is_intrinsic(jl_globalref_mod(e0), jl_globalref_name(e0)))))
         return 1;
     int i;
     for(i=0; i < jl_array_len(e->args); i++) {