Automated g4 rollback.

*** Reason for rollback ***

Issues mixing Java objects in native containers, like NSDictionary.

*** Original change description ***

Issue 423: fixed String.hashCode() to match JRE results.

***
	Change on 2014/11/18 by tball <[email protected]>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=80229801

Author: tomball

jre_emul/Classes/IOSPrimitiveClass.m

@@ -130,7 +130,7 @@ - (BOOL)isEqual:(id)anObject {
 }
 
 - (NSUInteger)hash {
-  return [name_ hashCode];
+  return [name_ hash];
 }
 
 - (NSString *)binaryName {

jre_emul/Classes/JavaObject.h

@@ -35,9 +35,6 @@
 // Returns the IOSClass of the receiver.
 - (IOSClass *)getClass;
 
-// Returns a hash code value for the object.
-- (jint)hashCode;
-
 // Wakes up a waiting thread (if any).
 - (void)notify;
 
@@ -46,8 +43,8 @@
 
 // Waits until another thread wakes it, or times out.
 - (void)wait;
-- (void)waitWithLong:(jlong)timeout;
-- (void)waitWithLong:(jlong)timeout withInt:(int)nanos;
+- (void)waitWithLong:(long long)timeout;
+- (void)waitWithLong:(long long)timeout withInt:(int)nanos;
 
 @end
 

jre_emul/Classes/NSObject+JavaObject.m

@@ -56,10 +56,6 @@ - (IOSClass *)getClass {
   return [IOSClass classWithClass:[self class]];
 }
 
-- (jint)hashCode {
-  return (jint)[self hash];
-}
-
 - (int)compareToWithId:(id)other {
 #if __has_feature(objc_arc)
   @throw [[JavaLangClassCastException alloc] init];
@@ -163,7 +159,6 @@ + (J2ObjcClassInfo *)__metadata {
     { "isEqual:", "equals", "Z", 0x1, NULL },
     { "clone", NULL, "LJavaLangObject", 0x4, "JavaLangCloneNotSupportedException" },
     { "dealloc", "finalize", "V", 0x4, "JavaLangThrowable" },
-    { "hashCode", NULL, "I", 0x1, NULL },
     { "notify", NULL, "V", 0x11, NULL },
     { "notifyAll", NULL, "V", 0x11, NULL },
     { "waitWithLong:", "wait", "V", 0x11, "JavaLangInterruptedException" },
@@ -173,7 +168,7 @@ + (J2ObjcClassInfo *)__metadata {
     { "hash", "hashCode", "I", 0x1, NULL },
   };
   static J2ObjcClassInfo _JavaLangObject = {
-    "Object", "java.lang", NULL, 0x1, 10, methods, 0, NULL, 0, NULL
+    "Object", "java.lang", NULL, 0x1, 9, methods, 0, NULL, 0, NULL
   };
   return &_JavaLangObject;
 }

jre_emul/Classes/NSString+JavaString.m

@@ -930,16 +930,16 @@ - (BOOL)contentEqualsStringBuffer:(JavaLangStringBuffer *)sb {
   return [self isEqualToString:[sb description]];
 }
 
-- (jint)hashCode {
+- (NSUInteger)hash {
   static const char *hashKey = "__JAVA_STRING_HASH_CODE_KEY__";
   id cachedHash = objc_getAssociatedObject(self, hashKey);
   if (cachedHash) {
     return [(JavaLangInteger *) cachedHash intValue];
   }
-  jint len = (jint)[self length];
-  jint hash = 0;
+  int len = (int)[self length];
+  int hash = 0;
   if (len > 0) {
-    jchar *chars = malloc(len * sizeof(jchar));
+    unichar *chars = malloc(len * sizeof(unichar));
     [self getCharacters:chars range:NSMakeRange(0, len)];
     for (int i = 0; i < len; i++) {
       hash = 31 * hash + (int)chars[i];
@@ -980,7 +980,6 @@ + (J2ObjcClassInfo *)__metadata {
     { "getBytes", NULL, "[B", 0x1, NULL },
     { "getBytesWithCharset:", NULL, "[B", 0x1, NULL },
     { "getBytesWithCharsetName:", NULL, "[B", 0x1, "Ljava/io/UnsupportedEncodingException;" },
-    { "hashCode", NULL, "I", 0x1, NULL },
     { "intern", NULL, "Ljava/lang/String;", 0x1, NULL },
     { "isEmpty", NULL, "Z", 0x1, NULL },
     { "matches:", NULL, "Z", 0x1, NULL },
@@ -1009,7 +1008,7 @@ + (J2ObjcClassInfo *)__metadata {
     { "serialPersistentFields_", NULL, 0x1a, "[Ljava/io/ObjectStreamField;", &NSString_serialPersistentFields_ },
     { "serialVersionUID_", NULL, 0x1a, "J", NULL, .constantValue.asLong = JavaLangString_serialVersionUID },
   };
-  static J2ObjcClassInfo _JavaLangString = { "String", "java.lang", NULL, 0x1, 47, methods, 3, fields, 0, NULL};
+  static J2ObjcClassInfo _JavaLangString = { "String", "java.lang", NULL, 0x1, 46, methods, 3, fields, 0, NULL};
   return &_JavaLangString;
 }
 

jre_emul/Classes/java/lang/reflect/Field.m

@@ -350,7 +350,7 @@ - (BOOL)isEqual:(id)anObject {
 }
 
 - (NSUInteger)hash {
-  return [[declaringClass_ getName] hashCode] ^ [[self propertyName] hashCode];
+  return [[declaringClass_ getName] hash] ^ [[self propertyName] hash];
 }
 
 #if ! __has_feature(objc_arc)

jre_emul/Classes/java/text/IOSCollator.java

@@ -85,7 +85,7 @@ public void setStrength(int value) {
 
   @Override
   public native int hashCode() /*-[
-    return (jint) [(NSLocale *) self->nsLocale_ hash];
+    return [(NSLocale *) self->nsLocale_ hash];
   ]-*/;
 
   @Override

jre_emul/Tests/StringHashTest.java

@@ -223,7 +223,7 @@ public int length() {
   public boolean matches(String s) {
     return false;
   }
-
+  
   public int offsetByCodePoints(int index, int codePointOffset) {
     return 0;
   }
@@ -321,7 +321,10 @@ public int compare(String s1, String s2) {
     }
   }
 
-  public int hashCode() {
-    return 0;
-  }
+  /* Unimplemented/mapped methods.
+  String(byte[] bytes, int i, int j, java.nio.charset.Charset charset)
+  String(byte[] bytes, java.nio.charset.Charset charset)
+  byte[] getBytes(java.nio.charset.Charset charset)
+  int offsetByCodePoints(int i, int j)
+  */
 }

jre_emul/stub_classes/java/lang/String.java

@@ -113,7 +113,6 @@ TEST_SOURCES = \
     ReentrantReadWriteLockTest.java \
     SerializationTest.java \
     ScheduledExecutorTest.java \
-    StringHashTest.java \
     SynchronousQueueTest.java \
     ThreadPoolExecutorTest.java \
     TimeUnitTest.java \

jre_emul/tests.mk

@@ -41,6 +41,7 @@
 # java.lang.Object
 java.lang.Object.equals(Ljava/lang/Object;)Z = NSObject isEqual:(id)anObject
 java.lang.Object.getClass()Ljava/lang/Class; = NSObject getClass
+java.lang.Object.hashCode()I = NSObject hash
 java.lang.Object.toString()Ljava/lang/String; = NSObject description
 
 # java.lang.Class
@@ -190,6 +191,7 @@ java.lang.String.getChars(II[CI)V = \
             sourceEnd:(int)sourceEnd \
           destination:(IOSCharArray *)dest \
      destinationBegin:(int)dstBegin
+java.lang.String.hashCode()I = NSObject hash
 java.lang.String.indexOf(I)I = NSString indexOf:(int)ch
 java.lang.String.indexOf(II)I = NSString indexOf:(int)ch fromIndex:(int)index
 java.lang.String.indexOf(Ljava/lang/String;)I = NSString indexOfString:(int)s

translator/src/main/resources/com/google/devtools/j2objc/JRE.mappings

@@ -319,7 +319,7 @@ public void testIntCastInStringConcatenation() throws IOException {
         + "  String b = \"foo\" + a.hashCode() + \"bar\" + a.length() + \"baz\"; } }",
         "Test", "Test.m");
     assertTranslation(translation,
-        "JreStrcat(\"$I$I$\", @\"foo\", [a hashCode], @\"bar\", ((jint) [a length]),"
+        "JreStrcat(\"$I$I$\", @\"foo\", ((jint) [a hash]), @\"bar\", ((jint) [a length]),"
           + " @\"baz\")");
   }
 
@@ -648,8 +648,8 @@ public void testCastInConstructorChain() throws IOException {
     List<Statement> stmts = translateStatements(source);
     assertEquals(1, stmts.size());
     String result = generateStatement(stmts.get(0));
-    assertEquals("jint i = [((JavaLangThrowable *) "
-        + "[[[JavaLangThrowable alloc] init] autorelease]) hashCode];", result);
+    assertEquals("jint i = ((jint) [((JavaLangThrowable *) "
+        + "[[[JavaLangThrowable alloc] init] autorelease]) hash]);", result);
   }
 
   public void testInnerClassCreation() throws IOException {
@@ -1663,7 +1663,7 @@ public void testStringLengthCompare() throws IOException {
     // Verify referenced return value is cast.
     assertTranslation(translation, "return -2 < ((jint) [@\"1\" length]);");
     // Verify unused return value isn't.
-    assertTranslation(translation, "[nil_chk(o) hashCode];");
+    assertTranslation(translation, "[nil_chk(o) hash];");
   }
 
   // Verify that casting from a floating point primitive to an integral primitive

translator/src/test/java/com/google/devtools/j2objc/gen/StatementGeneratorTest.java

@@ -339,7 +339,7 @@ public void testAutoboxCast() throws IOException {
         + "public int hashCode() { return ((Double) doubleValue).hashCode(); } }";
     String translation = translateSourceFile(source, "Test", "Test.m");
 
-    assertTranslation(translation, "[JavaLangDouble_valueOfWithDouble_(doubleValue_) hashCode]");
+    assertTranslation(translation, "[JavaLangDouble_valueOfWithDouble_(doubleValue_) hash]");
   }
 
   public void testAutoboxArrayIndex() throws IOException {

translator/src/test/java/com/google/devtools/j2objc/translate/AutoboxerTest.java

@@ -51,7 +51,7 @@ public void testSimpleInnerClass() throws IOException {
     assertTranslation(translation, "- (instancetype)initWithA:(A *)outer$;");
     translation = getTranslatedFile("A.m");
     assertTranslation(translation, "A *this$0_;");
-    assertTranslation(translation, "[nil_chk(this$0_->o_) hashCode]");
+    assertTranslation(translation, "[nil_chk(this$0_->o_) hash]");
     assertTranslation(translation, "A_B_set_this$0_(self, outer$);");
   }
 
@@ -84,7 +84,7 @@ public void testInnerInnerClass() throws IOException {
     translation = getTranslatedFile("A.m");
     assertTranslation(translation, "A *this$0_;");
     assertTranslation(translation, "A_B *this$0_;");
-    assertTranslation(translation, "[nil_chk(this$0_->this$0_->o_) hashCode]");
+    assertTranslation(translation, "[nil_chk(this$0_->this$0_->o_) hash]");
   }
 
   public void testWeakInnerInnerClass() throws IOException {
@@ -94,7 +94,7 @@ public void testWeakInnerInnerClass() throws IOException {
     String translation = translateSourceFile(source, "A", "A.m");
     assertTranslation(translation, "A *this$0_;");
     assertTranslation(translation, "__weak A_B *this$0_;");
-    assertTranslation(translation, "[nil_chk(this$0_->this$0_->o_) hashCode]");
+    assertTranslation(translation, "[nil_chk(this$0_->this$0_->o_) hash]");
   }
 
   public void testInnerMethodAnonymousClass() throws IOException {
@@ -119,7 +119,7 @@ public void testInnerMethodAnonymousClass() throws IOException {
     assertTranslation(translation, "A_B *this$1_;");
     assertTranslation(translation, "jint val$j_;");
     assertTranslation(translation, "[super initWithA:outer$->this$0_]");
-    assertTranslation(translation, "[nil_chk(this$1_->this$0_->o_) hashCode]");
+    assertTranslation(translation, "[nil_chk(this$1_->this$0_->o_) hash]");
   }
 
   /**

translator/src/test/java/com/google/devtools/j2objc/translate/InnerClassExtractorTest.java

@@ -92,7 +92,7 @@ public void testStringHashCode() throws IOException {
     List<Statement> stmts = translateStatements(source);
     assertEquals(1, stmts.size());
     String result = generateStatement(stmts.get(0));
-    assertEquals("jint test = [@\"foo\" hashCode];", result);
+    assertEquals("jint test = ((jint) [@\"foo\" hash]);", result);
   }
 
   public void testClassGetSuperclass() throws IOException {