Mercurial > hg > graal-jvmci-8
diff src/share/vm/code/dependencies.hpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:36:48 +0200 |
parents | 6ee9b878902b |
children | 12dcf5ba8b34 |
line wrap: on
line diff
--- a/src/share/vm/code/dependencies.hpp Wed May 27 13:43:27 2015 +0200 +++ b/src/share/vm/code/dependencies.hpp Thu May 28 15:36:48 2015 +0200 @@ -200,7 +200,7 @@ static void check_valid_dependency_type(DepType dept); -#ifdef GRAAL +#ifdef JVMCI // A Metadata* or object value recorded in an OopRecorder class DepValue VALUE_OBJ_CLASS_SPEC { private: @@ -249,7 +249,7 @@ // State for writing a new set of dependencies: GrowableArray<int>* _dep_seen; // (seen[h->ident] & (1<<dept)) GrowableArray<ciBaseObject*>* _deps[TYPE_LIMIT]; -#ifdef GRAAL +#ifdef JVMCI bool _using_dep_values; GrowableArray<DepValue>* _dep_values[TYPE_LIMIT]; #endif @@ -271,7 +271,7 @@ return (seen & (1<<dept)) != 0; } -#ifdef GRAAL +#ifdef JVMCI bool note_dep_seen(int dept, DepValue x) { assert(dept < BitsPerInt, "oops"); // place metadata deps at even indexes, object deps at odd indexes @@ -286,7 +286,7 @@ bool maybe_merge_ctxk(GrowableArray<ciBaseObject*>* deps, int ctxk_i, ciKlass* ctxk); -#ifdef GRAAL +#ifdef JVMCI bool maybe_merge_ctxk(GrowableArray<DepValue>* deps, int ctxk_i, DepValue ctxk); #endif @@ -311,9 +311,9 @@ Dependencies(ciEnv* env) { initialize(env); } -#ifdef GRAAL +#ifdef JVMCI Dependencies(Arena* arena, OopRecorder* oop_recorder, CompileLog* log); -#endif // GRAAL +#endif // JVMCI private: // Check for a valid context type. @@ -346,7 +346,7 @@ void assert_has_no_finalizable_subclasses(ciKlass* ctxk); void assert_call_site_target_value(ciCallSite* call_site, ciMethodHandle* method_handle); -#ifdef GRAAL +#ifdef JVMCI private: static void check_ctxk(Klass* ctxk) { assert(ctxk->oop_is_instance(), "java types only"); @@ -365,7 +365,7 @@ void assert_unique_concrete_method(Klass* ctxk, Method* uniqm); void assert_abstract_with_unique_concrete_subtype(Klass* ctxk, Klass* conck); void assert_call_site_target_value(oop callSite, oop methodHandle); -#endif // GRAAL +#endif // JVMCI // Define whether a given method or type is concrete. // These methods define the term "concrete" as used in this module.