8263677: Improve Character.isLowerCase/isUpperCase lookups

cl4es · cl4es · commit e152cc031291 · 2021-03-17T15:22:06.000Z
Reviewed-by: erikj, ihse, naoto, rriggs
diff --git a/make/data/characterdata/CharacterData00.java.template b/make/data/characterdata/CharacterData00.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -755,13 +755,11 @@ class CharacterData00 extends CharacterData {
     }
 
     boolean isLowerCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
     }
 
     boolean isUpperCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
     }
 
     boolean isWhitespace(int ch) {
diff --git a/make/data/characterdata/CharacterData01.java.template b/make/data/characterdata/CharacterData01.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -493,13 +493,11 @@ class CharacterData01 extends CharacterData {
     }
 
     boolean isLowerCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
     }
 
     boolean isUpperCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
     }
 
     boolean isWhitespace(int ch) {
diff --git a/make/data/characterdata/CharacterData02.java.template b/make/data/characterdata/CharacterData02.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,16 +212,13 @@ class CharacterData02 extends CharacterData {
     }
 
     boolean isLowerCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
     }
 
     boolean isUpperCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
     }
 
-
     boolean isWhitespace(int ch) {
         return (getProperties(ch) & $$maskIdentifierInfo) == $$valueJavaWhitespace;
     }
diff --git a/make/data/characterdata/CharacterData03.java.template b/make/data/characterdata/CharacterData03.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,13 +212,11 @@ class CharacterData03 extends CharacterData {
     }
 
     boolean isLowerCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
     }
 
     boolean isUpperCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
     }
 
     boolean isWhitespace(int ch) {
diff --git a/make/data/characterdata/CharacterData0E.java.template b/make/data/characterdata/CharacterData0E.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,13 +212,11 @@ class CharacterData0E extends CharacterData {
     }
 
     boolean isLowerCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
     }
 
     boolean isUpperCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
+        return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
     }
 
     boolean isWhitespace(int ch) {
diff --git a/make/data/characterdata/CharacterDataLatin1.java.template b/make/data/characterdata/CharacterDataLatin1.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,13 +87,12 @@ class CharacterDataLatin1 extends CharacterData {
 
     @IntrinsicCandidate
     boolean isLowerCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
-            || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0; // 0xaa, 0xba
+        return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
     }
 
     @IntrinsicCandidate
     boolean isUpperCase(int ch) {
-        return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER;
+        return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
     }
 
     boolean isOtherAlphabetic(int ch) {
diff --git a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java
diff --git a/test/micro/org/openjdk/bench/java/lang/Characters.java b/test/micro/org/openjdk/bench/java/lang/Characters.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -755,13 +755,11 @@ class CharacterData00 extends CharacterData {`
`755`	`755`	`}`
`756`	`756`
`757`	`757`	`boolean isLowerCase(int ch) {`
`758`		`- return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER`
`759`		`- \|\| (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
	`758`	`+ return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
`760`	`759`	`}`
`761`	`760`
`762`	`761`	`boolean isUpperCase(int ch) {`
`763`		`- return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER`
`764`		`- \|\| (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
	`762`	`+ return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
`765`	`763`	`}`
`766`	`764`
`767`	`765`	`boolean isWhitespace(int ch) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -493,13 +493,11 @@ class CharacterData01 extends CharacterData {`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`boolean isLowerCase(int ch) {`
`496`		`- return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER`
`497`		`- \|\| (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
	`496`	`+ return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
`498`	`497`	`}`
`499`	`498`
`500`	`499`	`boolean isUpperCase(int ch) {`
`501`		`- return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER`
`502`		`- \|\| (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
	`500`	`+ return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
`503`	`501`	`}`
`504`	`502`
`505`	`503`	`boolean isWhitespace(int ch) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -212,13 +212,11 @@ class CharacterData03 extends CharacterData {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`boolean isLowerCase(int ch) {`
`215`		`- return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER`
`216`		`- \|\| (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
	`215`	`+ return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
`217`	`216`	`}`
`218`	`217`
`219`	`218`	`boolean isUpperCase(int ch) {`
`220`		`- return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER`
`221`		`- \|\| (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
	`219`	`+ return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
`222`	`220`	`}`
`223`	`221`
`224`	`222`	`boolean isWhitespace(int ch) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -87,13 +87,12 @@ class CharacterDataLatin1 extends CharacterData {`
`87`	`87`
`88`	`88`	`@IntrinsicCandidate`
`89`	`89`	`boolean isLowerCase(int ch) {`
`90`		`- return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER`
`91`		`- \|\| (getPropertiesEx(ch) & $$maskOtherLowercase) != 0; // 0xaa, 0xba`
	`90`	`+ return (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`@IntrinsicCandidate`
`95`	`94`	`boolean isUpperCase(int ch) {`
`96`		`- return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER;`
	`95`	`+ return (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`boolean isOtherAlphabetic(int ch) {`