Mercurial > hg > truffle
diff src/share/vm/graal/graalCompiler.cpp @ 7126:ce248dc0a656
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 5a95c784febf |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp Mon Dec 03 15:32:17 2012 +0100 +++ b/src/share/vm/graal/graalCompiler.cpp Mon Dec 03 17:54:05 2012 +0100 @@ -70,14 +70,14 @@ ResourceMark rm; HandleMark hm; { - VM_ENTRY_MARK; + GRAAL_VM_ENTRY_MARK; check_pending_exception("Could not register natives"); } graal_compute_offsets(); { - VM_ENTRY_MARK; + GRAAL_VM_ENTRY_MARK; HandleMark hm; VMToCompiler::setDefaultOptions(); for (int i = 0; i < Arguments::num_graal_args(); ++i) { @@ -151,7 +151,7 @@ } void GraalCompiler::compile_method(methodHandle method, int entry_bci, jboolean blocking) { - EXCEPTION_CONTEXT + GRAAL_EXCEPTION_CONTEXT if (!_initialized) { method->clear_queued_for_compilation(); method->invocation_counter()->reset();