archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Nils Eliasson 2015-11-06 11:34:03 +01:00
commit 3307d0f163
326 changed files with 9465 additions and 4610 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
View file

@ -65,6 +65,7 @@ class JVMCIJavaClasses : AllStatic {
end_class \
start_class(InstalledCode) \
long_field(InstalledCode, address) \
long_field(InstalledCode, entryPoint) \
long_field(InstalledCode, version) \
oop_field(InstalledCode, name, "Ljava/lang/String;") \
end_class \
@ -215,8 +216,7 @@ class JVMCIJavaClasses : AllStatic {
boolean_field(HotSpotObjectConstantImpl, compressed) \
end_class \
start_class(HotSpotMetaspaceConstantImpl) \
long_field(HotSpotMetaspaceConstantImpl, primitive) \
oop_field(HotSpotMetaspaceConstantImpl, metaspaceObject, "Ljava/lang/Object;") \
oop_field(HotSpotMetaspaceConstantImpl, metaspaceObject, "Ljdk/vm/ci/hotspot/MetaspaceWrapperObject;") \
boolean_field(HotSpotMetaspaceConstantImpl, compressed) \
end_class \
start_class(HotSpotSentinelConstant) \
@ -261,11 +261,11 @@ class JVMCIJavaClasses : AllStatic {
end_class \
start_class(StackLockValue) \
oop_field(StackLockValue, owner, "Ljdk/vm/ci/meta/JavaValue;") \
oop_field(StackLockValue, slot, "Ljdk/vm/ci/code/StackSlotValue;") \
oop_field(StackLockValue, slot, "Ljdk/vm/ci/meta/AllocatableValue;") \
boolean_field(StackLockValue, eliminated) \
end_class \
start_class(SpeculationLog) \
oop_field(SpeculationLog, lastFailed, "Ljava/lang/Object;") \
start_class(HotSpotSpeculationLog) \
oop_field(HotSpotSpeculationLog, lastFailed, "Ljava/lang/Object;") \
end_class \
start_class(HotSpotStackFrameReference) \
oop_field(HotSpotStackFrameReference, compilerToVM, "Ljdk/vm/ci/hotspot/CompilerToVM;") \
@ -292,9 +292,11 @@ class JVMCIJavaClasses : AllStatic {
start_class(HotSpotConstantPool) \
long_field(HotSpotConstantPool, metaspaceConstantPool) \
end_class \
start_class(HotSpotJVMCIRuntime) \
objArrayOop_field(HotSpotJVMCIRuntime, trivialPrefixes, "[Ljava/lang/String;") \
end_class \
/* end*/
#define START_CLASS(name) \
class name : AllStatic { \
private: \