mirror of
https://github.com/corda/corda.git
synced 2025-01-05 20:54:13 +00:00
fix bootimage build
We now detect both metafactory and altMetafactory lambdas when bootimage-compiling invokedynamic instructions, as well as make allowance for the same lambda being invoked by multiple invokedynamic instructions (as is the case for Serializable lambdas).
This commit is contained in:
Joel Dice
parent
138699e203
commit
678d7debda
@ -27,4 +27,6 @@ public class ClassAddendum extends Addendum {
|
|||||||
public Pair enclosingMethod;
|
public Pair enclosingMethod;
|
||||||
|
|
||||||
public VMMethod[] bootstrapMethodTable;
|
public VMMethod[] bootstrapMethodTable;
|
||||||
|
|
||||||
|
public VMMethod[] bootstrapLambdaTable;
|
||||||
}
|
}
|
||||||
|
|||||||
274
src/compile.cpp
274
src/compile.cpp
@ -4040,15 +4040,26 @@ bool isLambda(Thread* t,
|
|||||||
return vm::strcmp(reinterpret_cast<const int8_t*>(
|
return vm::strcmp(reinterpret_cast<const int8_t*>(
|
||||||
"java/lang/invoke/LambdaMetafactory"),
|
"java/lang/invoke/LambdaMetafactory"),
|
||||||
bootstrap->class_()->name()->body().begin()) == 0
|
bootstrap->class_()->name()->body().begin()) == 0
|
||||||
and vm::strcmp(reinterpret_cast<const int8_t*>("metafactory"),
|
and ((vm::strcmp(reinterpret_cast<const int8_t*>("metafactory"),
|
||||||
bootstrap->name()->body().begin()) == 0
|
bootstrap->name()->body().begin()) == 0
|
||||||
and vm::strcmp(
|
and vm::strcmp(
|
||||||
reinterpret_cast<const int8_t*>(
|
reinterpret_cast<const int8_t*>(
|
||||||
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/"
|
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/"
|
||||||
"String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/"
|
"String;Ljava/lang/invoke/MethodType;Ljava/lang/"
|
||||||
"MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/"
|
"invoke/"
|
||||||
"invoke/MethodType;)Ljava/lang/invoke/CallSite;"),
|
"MethodType;Ljava/lang/invoke/MethodHandle;Ljava/"
|
||||||
bootstrap->spec()->body().begin()) == 0;
|
"lang/"
|
||||||
|
"invoke/MethodType;)Ljava/lang/invoke/CallSite;"),
|
||||||
|
bootstrap->spec()->body().begin()) == 0)
|
||||||
|
or (vm::strcmp(reinterpret_cast<const int8_t*>("altMetafactory"),
|
||||||
|
bootstrap->name()->body().begin()) == 0
|
||||||
|
and vm::strcmp(
|
||||||
|
reinterpret_cast<const int8_t*>(
|
||||||
|
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/"
|
||||||
|
"lang/"
|
||||||
|
"String;Ljava/lang/invoke/MethodType;[Ljava/lang/"
|
||||||
|
"Object;)Ljava/lang/invoke/CallSite;"),
|
||||||
|
bootstrap->spec()->body().begin()) == 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
void compile(MyThread* t,
|
void compile(MyThread* t,
|
||||||
@ -5133,120 +5144,147 @@ loop:
|
|||||||
GcClass* c = context->method->class_();
|
GcClass* c = context->method->class_();
|
||||||
PROTECT(t, c);
|
PROTECT(t, c);
|
||||||
|
|
||||||
GcCharArray* bootstrapArray = cast<GcCharArray>(
|
GcMethod* target
|
||||||
t,
|
= c->addendum()->bootstrapLambdaTable()
|
||||||
cast<GcArray>(t, c->addendum()->bootstrapMethodTable())
|
? cast<GcMethod>(
|
||||||
->body()[invocation->bootstrap()]);
|
t,
|
||||||
PROTECT(t, bootstrapArray);
|
cast<GcArray>(t, c->addendum()->bootstrapLambdaTable())
|
||||||
|
->body()[invocation->bootstrap()])
|
||||||
|
: nullptr;
|
||||||
|
PROTECT(t, target);
|
||||||
|
|
||||||
if (isLambda(t, c->loader(), bootstrapArray, invocation)) {
|
if (target == nullptr) {
|
||||||
if (bc->hostVM == 0) {
|
GcCharArray* bootstrapArray = cast<GcCharArray>(
|
||||||
|
t,
|
||||||
|
cast<GcArray>(t, c->addendum()->bootstrapMethodTable())
|
||||||
|
->body()[invocation->bootstrap()]);
|
||||||
|
PROTECT(t, bootstrapArray);
|
||||||
|
|
||||||
|
if (isLambda(t, c->loader(), bootstrapArray, invocation)) {
|
||||||
|
if (bc->hostVM == 0) {
|
||||||
|
throwNew(
|
||||||
|
t,
|
||||||
|
GcVirtualMachineError::Type,
|
||||||
|
"lambda expression encountered, but host VM is not "
|
||||||
|
"available; use -hostvm option to bootimage-generator to "
|
||||||
|
"fix this");
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEnv* e;
|
||||||
|
if (bc->hostVM->vtable->AttachCurrentThread(bc->hostVM, &e, 0)
|
||||||
|
== 0) {
|
||||||
|
e->vtable->PushLocalFrame(e, 256);
|
||||||
|
|
||||||
|
jclass lmfClass = e->vtable->FindClass(
|
||||||
|
e, "java/lang/invoke/LambdaMetafactory");
|
||||||
|
jmethodID makeLambda = e->vtable->GetStaticMethodID(
|
||||||
|
e,
|
||||||
|
lmfClass,
|
||||||
|
"makeLambda",
|
||||||
|
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/"
|
||||||
|
"String;Ljava/"
|
||||||
|
"lang/String;Ljava/lang/String;Ljava/lang/String;I)[B");
|
||||||
|
|
||||||
|
GcReference* reference = cast<GcReference>(
|
||||||
|
t,
|
||||||
|
singletonObject(
|
||||||
|
t, invocation->pool(), bootstrapArray->body()[2]));
|
||||||
|
int kind = reference->kind();
|
||||||
|
|
||||||
|
GcMethod* method
|
||||||
|
= cast<GcMethod>(t,
|
||||||
|
resolve(t,
|
||||||
|
c->loader(),
|
||||||
|
invocation->pool(),
|
||||||
|
bootstrapArray->body()[2],
|
||||||
|
findMethodInClass,
|
||||||
|
GcNoSuchMethodError::Type));
|
||||||
|
|
||||||
|
jarray lambda = e->vtable->CallStaticObjectMethod(
|
||||||
|
e,
|
||||||
|
lmfClass,
|
||||||
|
makeLambda,
|
||||||
|
e->vtable->NewStringUTF(
|
||||||
|
e,
|
||||||
|
reinterpret_cast<const char*>(
|
||||||
|
invocation->template_()->name()->body().begin())),
|
||||||
|
e->vtable->NewStringUTF(
|
||||||
|
e,
|
||||||
|
reinterpret_cast<const char*>(
|
||||||
|
invocation->template_()->spec()->body().begin())),
|
||||||
|
e->vtable->NewStringUTF(
|
||||||
|
e,
|
||||||
|
reinterpret_cast<const char*>(
|
||||||
|
cast<GcByteArray>(
|
||||||
|
t,
|
||||||
|
singletonObject(t,
|
||||||
|
invocation->pool(),
|
||||||
|
bootstrapArray->body()[1]))
|
||||||
|
->body()
|
||||||
|
.begin())),
|
||||||
|
e->vtable->NewStringUTF(
|
||||||
|
e,
|
||||||
|
reinterpret_cast<const char*>(
|
||||||
|
method->class_()->name()->body().begin())),
|
||||||
|
e->vtable->NewStringUTF(e,
|
||||||
|
reinterpret_cast<const char*>(
|
||||||
|
method->name()->body().begin())),
|
||||||
|
e->vtable->NewStringUTF(e,
|
||||||
|
reinterpret_cast<const char*>(
|
||||||
|
method->spec()->body().begin())),
|
||||||
|
kind);
|
||||||
|
|
||||||
|
uint8_t* bytes = reinterpret_cast<uint8_t*>(
|
||||||
|
e->vtable->GetPrimitiveArrayCritical(e, lambda, 0));
|
||||||
|
|
||||||
|
GcClass* lambdaClass
|
||||||
|
= defineClass(t,
|
||||||
|
roots(t)->appLoader(),
|
||||||
|
bytes,
|
||||||
|
e->vtable->GetArrayLength(e, lambda));
|
||||||
|
|
||||||
|
bc->resolver->addClass(
|
||||||
|
t, lambdaClass, bytes, e->vtable->GetArrayLength(e, lambda));
|
||||||
|
|
||||||
|
e->vtable->ReleasePrimitiveArrayCritical(e, lambda, bytes, 0);
|
||||||
|
|
||||||
|
e->vtable->PopLocalFrame(e, 0);
|
||||||
|
|
||||||
|
THREAD_RUNTIME_ARRAY(
|
||||||
|
t, char, spec, invocation->template_()->spec()->length());
|
||||||
|
memcpy(RUNTIME_ARRAY_BODY(spec),
|
||||||
|
invocation->template_()->spec()->body().begin(),
|
||||||
|
invocation->template_()->spec()->length());
|
||||||
|
|
||||||
|
target = resolveMethod(
|
||||||
|
t, lambdaClass, "make", RUNTIME_ARRAY_BODY(spec));
|
||||||
|
|
||||||
|
GcArray* table
|
||||||
|
= cast<GcArray>(t, c->addendum()->bootstrapLambdaTable());
|
||||||
|
if (table == nullptr) {
|
||||||
|
table = makeArray(
|
||||||
|
t,
|
||||||
|
cast<GcArray>(t, c->addendum()->bootstrapMethodTable())
|
||||||
|
->length());
|
||||||
|
c->addendum()->setBootstrapLambdaTable(t, table);
|
||||||
|
}
|
||||||
|
|
||||||
|
table->setBodyElement(t, invocation->bootstrap(), target);
|
||||||
|
} else {
|
||||||
|
throwNew(t,
|
||||||
|
GcVirtualMachineError::Type,
|
||||||
|
"unable to attach to host VM");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
throwNew(t,
|
throwNew(t,
|
||||||
GcVirtualMachineError::Type,
|
GcVirtualMachineError::Type,
|
||||||
"lambda expression encountered, but host VM is not "
|
"invokedynamic not supported for AOT-compiled code except "
|
||||||
"available; use -hostvm option to bootimage-generator to "
|
"in the case of lambda expressions");
|
||||||
"fix this");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEnv* e;
|
|
||||||
if (bc->hostVM->vtable->AttachCurrentThread(bc->hostVM, &e, 0) == 0) {
|
|
||||||
e->vtable->PushLocalFrame(e, 256);
|
|
||||||
|
|
||||||
jclass lmfClass
|
|
||||||
= e->vtable->FindClass(e, "java/lang/invoke/LambdaMetafactory");
|
|
||||||
jmethodID makeLambda = e->vtable->GetStaticMethodID(
|
|
||||||
e,
|
|
||||||
lmfClass,
|
|
||||||
"makeLambda",
|
|
||||||
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/"
|
|
||||||
"lang/String;Ljava/lang/String;Ljava/lang/String;I)[B");
|
|
||||||
|
|
||||||
GcReference* reference = cast<GcReference>(
|
|
||||||
t,
|
|
||||||
singletonObject(
|
|
||||||
t, invocation->pool(), bootstrapArray->body()[2]));
|
|
||||||
int kind = reference->kind();
|
|
||||||
|
|
||||||
GcMethod* method
|
|
||||||
= cast<GcMethod>(t,
|
|
||||||
resolve(t,
|
|
||||||
c->loader(),
|
|
||||||
invocation->pool(),
|
|
||||||
bootstrapArray->body()[2],
|
|
||||||
findMethodInClass,
|
|
||||||
GcNoSuchMethodError::Type));
|
|
||||||
|
|
||||||
jarray lambda = e->vtable->CallStaticObjectMethod(
|
|
||||||
e,
|
|
||||||
lmfClass,
|
|
||||||
makeLambda,
|
|
||||||
e->vtable->NewStringUTF(
|
|
||||||
e,
|
|
||||||
reinterpret_cast<const char*>(
|
|
||||||
invocation->template_()->name()->body().begin())),
|
|
||||||
e->vtable->NewStringUTF(
|
|
||||||
e,
|
|
||||||
reinterpret_cast<const char*>(
|
|
||||||
invocation->template_()->spec()->body().begin())),
|
|
||||||
e->vtable->NewStringUTF(
|
|
||||||
e,
|
|
||||||
reinterpret_cast<const char*>(
|
|
||||||
cast<GcByteArray>(
|
|
||||||
t,
|
|
||||||
singletonObject(t,
|
|
||||||
invocation->pool(),
|
|
||||||
bootstrapArray->body()[1]))
|
|
||||||
->body()
|
|
||||||
.begin())),
|
|
||||||
e->vtable->NewStringUTF(
|
|
||||||
e,
|
|
||||||
reinterpret_cast<const char*>(
|
|
||||||
method->class_()->name()->body().begin())),
|
|
||||||
e->vtable->NewStringUTF(e,
|
|
||||||
reinterpret_cast<const char*>(
|
|
||||||
method->name()->body().begin())),
|
|
||||||
e->vtable->NewStringUTF(e,
|
|
||||||
reinterpret_cast<const char*>(
|
|
||||||
method->spec()->body().begin())),
|
|
||||||
kind);
|
|
||||||
|
|
||||||
uint8_t* bytes = reinterpret_cast<uint8_t*>(
|
|
||||||
e->vtable->GetPrimitiveArrayCritical(e, lambda, 0));
|
|
||||||
|
|
||||||
GcClass* lambdaClass
|
|
||||||
= defineClass(t,
|
|
||||||
roots(t)->appLoader(),
|
|
||||||
bytes,
|
|
||||||
e->vtable->GetArrayLength(e, lambda));
|
|
||||||
|
|
||||||
bc->resolver->addClass(
|
|
||||||
t, lambdaClass, bytes, e->vtable->GetArrayLength(e, lambda));
|
|
||||||
|
|
||||||
e->vtable->ReleasePrimitiveArrayCritical(e, lambda, bytes, 0);
|
|
||||||
|
|
||||||
e->vtable->PopLocalFrame(e, 0);
|
|
||||||
|
|
||||||
THREAD_RUNTIME_ARRAY(
|
|
||||||
t, char, spec, invocation->template_()->spec()->length());
|
|
||||||
memcpy(RUNTIME_ARRAY_BODY(spec),
|
|
||||||
invocation->template_()->spec()->body().begin(),
|
|
||||||
invocation->template_()->spec()->length());
|
|
||||||
|
|
||||||
GcMethod* target = resolveMethod(
|
|
||||||
t, lambdaClass, "make", RUNTIME_ARRAY_BODY(spec));
|
|
||||||
|
|
||||||
bool tailCall = isTailCall(t, code, ip, context->method, target);
|
|
||||||
compileDirectInvoke(t, frame, target, tailCall);
|
|
||||||
} else {
|
|
||||||
throwNew(
|
|
||||||
t, GcVirtualMachineError::Type, "unable to attach to host VM");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
throwNew(t,
|
|
||||||
GcVirtualMachineError::Type,
|
|
||||||
"invokedynamic not supported for AOT-compiled code except "
|
|
||||||
"in the case of lambda expressions");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool tailCall = isTailCall(t, code, ip, context->method, target);
|
||||||
|
compileDirectInvoke(t, frame, target, tailCall);
|
||||||
} else {
|
} else {
|
||||||
unsigned index = addDynamic(t, invocation);
|
unsigned index = addDynamic(t, invocation);
|
||||||
|
|
||||||
|
|||||||
@ -1220,7 +1220,7 @@ GcClassAddendum* getClassAddendum(Thread* t, GcClass* class_, GcSingleton* pool)
|
|||||||
if (addendum == 0) {
|
if (addendum == 0) {
|
||||||
PROTECT(t, class_);
|
PROTECT(t, class_);
|
||||||
|
|
||||||
addendum = makeClassAddendum(t, pool, 0, 0, 0, 0, -1, 0, 0, 0);
|
addendum = makeClassAddendum(t, pool, 0, 0, 0, 0, -1, 0, 0, 0, 0);
|
||||||
setField(t, class_, ClassAddendum, addendum);
|
setField(t, class_, ClassAddendum, addendum);
|
||||||
}
|
}
|
||||||
return addendum;
|
return addendum;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user