Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalRuntime.cpp @ 18748:3d6e630a72f1
Fix GNFI class loader problem
author | Matthias Grimmer <grimmer@ssw.jku.at> |
---|---|
date | Wed, 17 Dec 2014 11:24:42 +0100 |
parents | 88c280297bd2 |
children | afa70d3e8159 |
comparison
equal
deleted
inserted
replaced
18747:6db7923af642 | 18748:3d6e630a72f1 |
---|---|
694 JVM_ENTRY(jobject, JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c)) | 694 JVM_ENTRY(jobject, JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c)) |
695 const char* backendName = NULL; | 695 const char* backendName = NULL; |
696 #ifdef TARGET_ARCH_x86 | 696 #ifdef TARGET_ARCH_x86 |
697 #ifdef _LP64 | 697 #ifdef _LP64 |
698 backendName = "com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend"; | 698 backendName = "com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend"; |
699 #endif | 699 #endif |
700 #endif | 700 #endif |
701 | 701 |
702 if (backendName == NULL) { | 702 if (backendName == NULL) { |
703 return NULL; | 703 return NULL; |
704 } | 704 } |
705 GraalRuntime::ensure_graal_class_loader_is_initialized(); | |
705 TempNewSymbol name = SymbolTable::new_symbol(backendName, CHECK_NULL); | 706 TempNewSymbol name = SymbolTable::new_symbol(backendName, CHECK_NULL); |
706 KlassHandle klass = GraalRuntime::resolve_or_fail(name, CHECK_NULL); | 707 KlassHandle klass = GraalRuntime::resolve_or_fail(name, CHECK_NULL); |
707 | 708 |
708 TempNewSymbol makeInstance = SymbolTable::new_symbol("createNativeFunctionInterface", CHECK_NULL); | 709 TempNewSymbol makeInstance = SymbolTable::new_symbol("createNativeFunctionInterface", CHECK_NULL); |
709 TempNewSymbol sig = SymbolTable::new_symbol("()Lcom/oracle/nfi/api/NativeFunctionInterface;", CHECK_NULL); | 710 TempNewSymbol sig = SymbolTable::new_symbol("()Lcom/oracle/nfi/api/NativeFunctionInterface;", CHECK_NULL); |