ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #523 from exFalso/fix-array-class-flags

Browse Source 
Fix array flags
This commit is contained in:
Joel Dice 2017-02-15 17:42:06 -07:00 committed by GitHub
commit f58b663aa5
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/machine.cpp
View File

@ -2940,8 +2940,15 @@ GcClass* makeArrayClass(Thread* t,
GcArray* vtable = cast<GcArray>(t, type(t, GcJobject::Type)->virtualTable());
// From JDK docs: for array classes the public, private, protected modifiers are the same as
// the underlying type, and the final modifier is always set. Testing on OpenJDK shows that
// ACC_ABSTRACT is also set on array classes.
int flags = elementClass->flags() & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED);
flags |= ACC_FINAL;
flags |= ACC_ABSTRACT;
GcClass* c = t->m->processor->makeClass(t,
0,
flags,
0,
2 * BytesPerWord,
BytesPerWord,
@ -3147,10 +3154,35 @@ void bootClass(Thread* t,
mask = 0;
}
int flags = 0;
switch(type) {
case Gc::JbyteType:
case Gc::JintType:
case Gc::JshortType:
case Gc::JlongType:
case Gc::JbooleanType:
case Gc::JcharType:
case Gc::JfloatType:
case Gc::JdoubleType:
case Gc::ByteArrayType:
case Gc::IntArrayType:
case Gc::ShortArrayType:
case Gc::LongArrayType:
case Gc::BooleanArrayType:
case Gc::CharArrayType:
case Gc::FloatArrayType:
case Gc::DoubleArrayType:
// Primitive and array types are final, abstract and public.
flags = ACC_FINAL | ACC_ABSTRACT | ACC_PUBLIC;
default:
break;
}
super = (superType >= 0 ? vm::type(t, static_cast<Gc::Type>(superType)) : 0);
GcClass* class_ = t->m->processor->makeClass(t,
0,
flags,
BootstrapFlag,
fixedSize,
arrayElementSize,