two more builtins needed for escape analysis

JuliaLang · Aug 28, 2014 · 079423d · 079423d
1 parent c58ecde
commit 079423d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -1188,9 +1188,12 @@ static void simple_escape_analysis(jl_value_t *expr, bool varesc, bool envesc, j
                         varesc = true;
                         envesc = true;
                         i = 2;
-                    } else if (ff->fptr == jl_f_typeassert) {
+                    } else if (ff->fptr == jl_f_typeassert ||
+                               ff->fptr == jl_f_convert_default) {
+                        simple_escape_analysis(jl_exprarg(e,1), true, envesc, ctx);
                         varesc = true;
-                        //envesc = envesc;
+                        envesc = false;
+                        i = 2;
                     }
                     else {
                         varesc = true;
@@ -1217,6 +1220,9 @@ static void simple_escape_analysis(jl_value_t *expr, bool varesc, bool envesc, j
             envesc = true;
             i = 1;
         }
+        else if (e->head == amp_sym) {
+            i = 0;
+        }
         else if (e->head == line_sym) {
             return;
         }