Mercurial > hg > graal-compiler

diff src/share/vm/graal/graalEnv.cpp @ 7126:ce248dc0a656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed all Graal modifications to ci and c1
author Doug Simon <doug.simon@oracle.com>
date Mon, 03 Dec 2012 17:54:05 +0100
parents 1baf7f1e3f23
children 5d0bb7d52783
line wrap: on
line diff
--- a/src/share/vm/graal/graalEnv.cpp	Mon Dec 03 15:32:17 2012 +0100
+++ b/src/share/vm/graal/graalEnv.cpp	Mon Dec 03 17:54:05 2012 +0100
@@ -70,7 +70,7 @@
                                           constantPoolHandle& cpool,
                                           Symbol* sym,
                                           bool require_local) {
-  EXCEPTION_CONTEXT;
+  GRAAL_EXCEPTION_CONTEXT;
 
   // Now we need to check the SystemDictionary
   if (sym->byte_at(0) == 'L' &&
@@ -162,7 +162,7 @@
                                         int index,
                                         bool& is_accessible,
                                         KlassHandle& accessor) {
-  EXCEPTION_CONTEXT;
+  GRAAL_EXCEPTION_CONTEXT;
   KlassHandle klass (THREAD, ConstantPool::klass_at_if_loaded(cpool, index));
   Symbol* klass_name = NULL;
   if (klass.is_null()) {
@@ -233,7 +233,7 @@
 // in the accessor klass.
 void GraalEnv::get_field_by_index_impl(instanceKlassHandle& klass, fieldDescriptor& field_desc,
                                         int index) {
-  EXCEPTION_CONTEXT;
+  GRAAL_EXCEPTION_CONTEXT;
 
   assert(klass->is_linked(), "must be linked before using its constant-pool");
 
@@ -285,7 +285,7 @@
                                Symbol*       name,
                                Symbol*       sig,
                                Bytecodes::Code bc) {
-  EXCEPTION_CONTEXT;
+  GRAAL_EXCEPTION_CONTEXT;
   LinkResolver::check_klass_accessability(h_accessor, h_holder, KILL_COMPILE_ON_FATAL_(NULL));
   methodHandle dest_method;
   switch (bc) {
@@ -421,7 +421,7 @@
                                 bool has_debug_info,
                                 bool has_unsafe_access,
                                 Handle installed_code) {
-  EXCEPTION_CONTEXT;
+  GRAAL_EXCEPTION_CONTEXT;
   NMethodSweeper::possibly_sweep();
   nm = NULL;
   int comp_level = CompLevel_simple;