diff --git a/.hgtags b/.hgtags index c3f75750cc4..52b21145d8b 100644 --- a/.hgtags +++ b/.hgtags @@ -539,3 +539,4 @@ a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4 e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5 44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29 b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6 +6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30 diff --git a/make/data/lsrdata/language-subtag-registry.txt b/make/data/lsrdata/language-subtag-registry.txt index 5d86975f74a..67b3705749e 100644 --- a/make/data/lsrdata/language-subtag-registry.txt +++ b/make/data/lsrdata/language-subtag-registry.txt @@ -1,4 +1,4 @@ -File-Date: 2018-10-31 +File-Date: 2018-11-30 %% Type: language Subtag: aa @@ -593,6 +593,7 @@ Suppress-Script: Latn Type: language Subtag: lg Description: Ganda +Description: Luganda Added: 2005-10-16 %% Type: language diff --git a/src/hotspot/share/prims/jvmtiManageCapabilities.cpp b/src/hotspot/share/prims/jvmtiManageCapabilities.cpp index f1ab1c2d6dc..5fc2d653946 100644 --- a/src/hotspot/share/prims/jvmtiManageCapabilities.cpp +++ b/src/hotspot/share/prims/jvmtiManageCapabilities.cpp @@ -107,6 +107,14 @@ jvmtiCapabilities JvmtiManageCapabilities::init_onload_capabilities() { #ifndef ZERO jc.can_pop_frame = 1; jc.can_force_early_return = 1; + // Workaround for 8195635: + // disable pop_frame and force_early_return capabilities with Graal +#if INCLUDE_JVMCI + if (UseJVMCICompiler) { + jc.can_pop_frame = 0; + jc.can_force_early_return = 0; + } +#endif // INCLUDE_JVMCI #endif // !ZERO jc.can_get_source_debug_extension = 1; jc.can_access_local_variables = 1; diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java index 1c3580c24d7..f90a964af93 100644 --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2019, 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 @@ -35,35 +35,29 @@ import jdk.internal.misc.VM; /** * The {@code Character} class wraps a value of the primitive - * type {@code char} in an object. An object of type + * type {@code char} in an object. An object of class * {@code Character} contains a single field whose type is * {@code char}. *

- * In addition, this class provides several methods for determining - * a character's category (lowercase letter, digit, etc.) and for converting - * characters from uppercase to lowercase and vice versa. + * In addition, this class provides a large number of static methods for + * determining a character's category (lowercase letter, digit, etc.) + * and for converting characters from uppercase to lowercase and vice + * versa. + * + *

Unicode Conformance

*

- * Character information is based on the Unicode Standard, version 11.0.0. + * The fields and methods of class {@code Character} are defined in terms + * of character information from the Unicode Standard, specifically the + * UnicodeData file that is part of the Unicode Character Database. + * This file specifies properties including name and category for every + * assigned Unicode code point or character range. The file is available + * from the Unicode Consortium at + * http://www.unicode.org. *

- * The methods and data of class {@code Character} are defined by - * the information in the UnicodeData file that is part of the - * Unicode Character Database maintained by the Unicode - * Consortium. This file specifies various properties including name - * and general category for every defined Unicode code point or - * character range. - *

- * The file and its description are available from the Unicode Consortium at: - *

- *

- * The code point, U+32FF, is reserved by the Unicode Consortium - * to represent the Japanese square character for the new era that begins - * May 2019. Relevant methods in the Character class return the same - * properties as for the existing Japanese era characters (e.g., U+337E for - * "Meizi"). For the details of the code point, refer to - * - * http://blog.unicode.org/2018/09/new-japanese-era.html. + * The Java SE 12 Platform uses character information from version 11.0 + * of the Unicode Standard, plus the Japanese Era code point, + * {@code U+32FF}, from the first version of the Unicode Standard + * after 11.0 that assigns the code point. * *

Unicode Character Representations

* @@ -9495,7 +9489,7 @@ class Character implements java.io.Serializable, Comparable { * character in a Java identifier. *

* A character may start a Java identifier if and only if - * one of the following is true: + * one of the following conditions is true: *