Mercurial > hg > graal-compiler
comparison src/share/vm/prims/jvm.cpp @ 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 | 7848fc12602b |
children | c28cb37b2e1d |
comparison
equal
deleted
inserted
replaced
21558:d563baeca9df | 21559:be896a1983c0 |
---|---|
381 #else | 381 #else |
382 #if defined(COMPILER1) | 382 #if defined(COMPILER1) |
383 const char* compiler_name = "HotSpot " CSIZE "Client Compiler"; | 383 const char* compiler_name = "HotSpot " CSIZE "Client Compiler"; |
384 #elif defined(COMPILER2) | 384 #elif defined(COMPILER2) |
385 const char* compiler_name = "HotSpot " CSIZE "Server Compiler"; | 385 const char* compiler_name = "HotSpot " CSIZE "Server Compiler"; |
386 #elif defined(GRAAL) | 386 #elif defined(JVMCI) |
387 const char* compiler_name = "HotSpot " CSIZE "Graal Compiler"; | 387 const char* compiler_name = "HotSpot " CSIZE "JVMCI Compiler"; |
388 #else | 388 #else |
389 const char* compiler_name = ""; | 389 const char* compiler_name = ""; |
390 #endif // compilers | 390 #endif // compilers |
391 #endif // TIERED | 391 #endif // TIERED |
392 | 392 |
2360 assert(k->oop_is_instance(), "must be an instance klass"); | 2360 assert(k->oop_is_instance(), "must be an instance klass"); |
2361 if (! k->oop_is_instance()) return false; | 2361 if (! k->oop_is_instance()) return false; |
2362 | 2362 |
2363 ResourceMark rm(THREAD); | 2363 ResourceMark rm(THREAD); |
2364 const char* name = k->name()->as_C_string(); | 2364 const char* name = k->name()->as_C_string(); |
2365 bool system_class = k->class_loader() == NULL GRAAL_ONLY(|| SystemDictionary::graal_loader() == k->class_loader()); | 2365 bool system_class = k->class_loader() == NULL JVMCI_ONLY(|| SystemDictionary::jvmci_loader() == k->class_loader()); |
2366 return JavaAssertions::enabled(name, system_class); | 2366 return JavaAssertions::enabled(name, system_class); |
2367 | 2367 |
2368 JVM_END | 2368 JVM_END |
2369 | 2369 |
2370 | 2370 |