Mercurial > hg > truffle

changeset 4578:b70d180ec022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed regressions in building and running debug verison of HotSpot Client.
author Doug Simon <doug.simon@oracle.com>
date Mon, 13 Feb 2012 14:02:30 +0100
parents bc8b58c11768
children 854145ec9866
files src/cpu/x86/vm/c2_globals_x86.hpp src/share/vm/c1/c1_IR.hpp src/share/vm/c1/c1_LIRAssembler.cpp
diffstat 3 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Mon Feb 13 14:01:49 2012 +0100
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Mon Feb 13 14:02:30 2012 +0100
@@ -39,7 +39,6 @@
 define_pd_global(bool, PreferInterpreterNativeStubs, false);
 define_pd_global(bool, ProfileTraps,                 true);
 define_pd_global(bool, UseOnStackReplacement,        true);
-define_pd_global(intx, TypeProfileWidth,             2   );
 #ifdef CC_INTERP
 define_pd_global(bool, ProfileInterpreter,           false);
 #else
--- a/src/share/vm/c1/c1_IR.hpp	Mon Feb 13 14:01:49 2012 +0100
+++ b/src/share/vm/c1/c1_IR.hpp	Mon Feb 13 14:02:30 2012 +0100
@@ -237,6 +237,7 @@
     // reexecute allowed only for the topmost frame
     bool reexecute = topmost ? should_reexecute() : false;
     bool return_oop = false; // This flag will be ignored since it used only for C2 with escape analysis.
+    ResetNoHandleMark rnhm;
     recorder->describe_scope(pc_offset, (methodOop)scope()->method()->get_oop(), bci(), reexecute, false, is_method_handle_invoke, return_oop, locvals, expvals, monvals);
   }
 };
--- a/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Feb 13 14:01:49 2012 +0100
+++ b/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Feb 13 14:02:30 2012 +0100
@@ -405,6 +405,7 @@
     if (s == NULL)  break;
     IRScope* scope = s->scope();
     //Always pass false for reexecute since these ScopeDescs are never used for deopt
+    ResetNoHandleMark rnhm;
     debug_info->describe_scope(pc_offset, (methodOop)scope->method()->get_oop(), s->bci(), false/*reexecute*/, false/*rethrow_exception*/);
   }