[vmkit-commits] [vmkit] r142977 - /vmkit/trunk/lib/J3/VMCore/JavaString.h

[Will Dietz]

Author: wdietz2
Date: Tue Oct 25 16:33:10 2011
New Revision: 142977

URL: http://llvm.org/viewvc/llvm-project?rev=142977&view=rev
Log:
Fix JavaString field layout for OpenJDK

Modified:
    vmkit/trunk/lib/J3/VMCore/JavaString.h

Modified: vmkit/trunk/lib/J3/VMCore/JavaString.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.h?rev=142977&r1=142976&r2=142977&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.h Tue Oct 25 16:33:10 2011
@@ -22,12 +22,19 @@
 
 class JavaString : public JavaObject {
  private:
-  // CLASSPATH FIELDS!!
   const ArrayUInt16* value;
  public:
+#ifndef USE_OPENJDK
+  // Classpath fields
   sint32 count;
   sint32 cachedHashCode;
   sint32 offset;
+#else
+  // OpenJDK fields
+  sint32 offset;
+  sint32 count;
+  sint32 cachedHashCode;
+#endif
 
   static void setValue(JavaString* self, const ArrayUInt16* array) {
     llvm_gcroot(self, 0);