===================================================================
@@ -1,4 +1,4 @@
-b9885a251ae2c43252926dbe1960df5640aa469b
+1427cedcb0faa627fd89a75e009f7898c25aa86c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
===================================================================
@@ -692,6 +692,12 @@ Gogo::analyze_escape()
if (!optimize_allocation_flag.is_enabled() || saw_errors())
return;
+ // Currently runtime is hard-coded to non-escape in various places.
+ // Don't run escape analysis for runtime.
+ // TODO: remove this once it works for runtime.
+ if (this->compiling_runtime() && this->package_name() == "runtime")
+ return;
+
// Discover strongly connected groups of functions to analyze for escape
// information in this package.
this->discover_analysis_sets();