diff src/share/vm/ci/bcEscapeAnalyzer.hpp @ 4122:cc81b9c09bbb

7112478: after 7105605 JRuby bench_define_method_methods.rb fails with NPE Summary: Fixed several EA issues with Connection Graph construction. Reviewed-by: never, twisti
author kvn
date Mon, 28 Nov 2011 15:46:31 -0800
parents f95d63e2154a
children da91efe96a93
line wrap: on
line diff
--- a/src/share/vm/ci/bcEscapeAnalyzer.hpp	Tue Nov 22 09:45:57 2011 +0100
+++ b/src/share/vm/ci/bcEscapeAnalyzer.hpp	Mon Nov 28 15:46:31 2011 -0800
@@ -81,7 +81,7 @@
   bool is_arg_stack(ArgumentMap vars);
   void clear_bits(ArgumentMap vars, VectorSet &bs);
   void set_method_escape(ArgumentMap vars);
-  void set_global_escape(ArgumentMap vars);
+  void set_global_escape(ArgumentMap vars, bool merge = false);
   void set_dirty(ArgumentMap vars);
   void set_modified(ArgumentMap vars, int offs, int size);