Skip to content
Permalink
Browse files

Merge

  • Loading branch information
JesperIRL committed Jan 22, 2020
2 parents d5bdb76 + b94b082 commit b7cdc097e33630066663c9381580e57a563ada28
Showing with 766 additions and 914 deletions.
  1. +2 −1 src/hotspot/share/gc/g1/g1OopClosures.hpp
  2. +1 −1 src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
  3. +10 −1 src/hotspot/share/gc/g1/g1SharedClosures.hpp
  4. +9 −4 src/hotspot/share/prims/jvmtiTagMap.cpp
  5. +1 −1 src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
  6. +1 −1 src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
  7. +12 −2 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
  8. +12 −2 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
  9. +99 −3 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
  10. +99 −3 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
  11. +36 −36 ...tor.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties
  12. +36 −36 ....jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties
  13. +59 −59 ...ator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties
  14. +59 −59 ...r.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties
  15. +14 −249 ...ator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties
  16. +13 −249 ...r.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties
  17. +58 −59 ...ator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties
  18. +59 −60 ...r.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties
  19. +35 −35 ...tor.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_ja.properties
  20. +35 −35 ....jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_zh_CN.properties
  21. +1 −1 src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
  22. +1 −1 src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
  23. +13 −1 ....javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
  24. +13 −1 ...vadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
  25. +39 −2 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
  26. +39 −2 ...jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
  27. +3 −3 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
  28. +3 −3 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
  29. +2 −2 src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
  30. +2 −2 src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -152,7 +152,8 @@ class G1ParCopyHelper : public OopClosure {

enum G1Barrier {
G1BarrierNone,
G1BarrierCLD
G1BarrierCLD,
G1BarrierNoOptRoots // Do not collect optional roots.
};

enum G1Mark {
@@ -246,7 +246,7 @@ void G1ParCopyClosure<barrier, do_mark_object>::do_oop_work(T* p) {
} else {
if (state.is_humongous()) {
_g1h->set_humongous_is_live(obj);
} else if (state.is_optional()) {
} else if ((barrier != G1BarrierNoOptRoots) && state.is_optional()) {
_par_scan_state->remember_root_into_optional_region(p);
}

@@ -40,13 +40,22 @@ class G1SharedClosures {
public:
G1ParCopyClosure<G1BarrierNone, Mark> _oops;
G1ParCopyClosure<G1BarrierCLD, Mark> _oops_in_cld;
// We do not need (and actually should not) collect oops from nmethods into the
// optional collection set as we already automatically collect the corresponding
// nmethods in the region's strong code roots set. So set G1BarrierNoOptRoots in
// this closure.
// If these were present there would be opportunity for multiple threads to try
// to change this oop* at the same time. Since embedded oops are not necessarily
// word-aligned, this could lead to word tearing during update and crashes.
G1ParCopyClosure<G1BarrierNoOptRoots, Mark> _oops_in_nmethod;

G1CLDScanClosure _clds;
G1CodeBlobClosure _codeblobs;

G1SharedClosures(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty) :
_oops(g1h, pss),
_oops_in_cld(g1h, pss),
_oops_in_nmethod(g1h, pss),
_clds(&_oops_in_cld, process_only_dirty),
_codeblobs(pss->worker_id(), &_oops, needs_strong_processing()) {}
_codeblobs(pss->worker_id(), &_oops_in_nmethod, needs_strong_processing()) {}
};
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020, 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
@@ -97,6 +97,11 @@ class JvmtiTagHashmapEntry : public CHeapObj<mtInternal> {
inline oop object_peek() {
return NativeAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(object_addr());
}

inline oop object_raw() {
return RawAccess<>::oop_load(object_addr());
}

inline jlong tag() const { return _tag; }

inline void set_tag(jlong tag) {
@@ -3352,7 +3357,7 @@ void JvmtiTagMap::do_weak_oops(BoolObjectClosure* is_alive, OopClosure* f) {
JvmtiTagHashmapEntry* next = entry->next();

// has object been GC'ed
if (!is_alive->do_object_b(entry->object_peek())) {
if (!is_alive->do_object_b(entry->object_raw())) {
// grab the tag
jlong tag = entry->tag();
guarantee(tag != 0, "checking");
@@ -3370,7 +3375,7 @@ void JvmtiTagMap::do_weak_oops(BoolObjectClosure* is_alive, OopClosure* f) {
++freed;
} else {
f->do_oop(entry->object_addr());
oop new_oop = entry->object_peek();
oop new_oop = entry->object_raw();

// if the object has moved then re-hash it and move its
// entry to its new location.
@@ -3404,7 +3409,7 @@ void JvmtiTagMap::do_weak_oops(BoolObjectClosure* is_alive, OopClosure* f) {
// Re-add all the entries which were kept aside
while (delayed_add != NULL) {
JvmtiTagHashmapEntry* next = delayed_add->next();
unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_peek(), size);
unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_raw(), size);
delayed_add->set_next(table[pos]);
table[pos] = delayed_add;
delayed_add = next;
@@ -466,7 +466,7 @@
{"migrate.keystore.warning", "\"%1$s\"\u304C%4$s\u306B\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002%2$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059\u3002"},
{"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."},
{"importing.keystore.status", "\u30AD\u30FC\u30B9\u30C8\u30A2%1$s\u3092%2$s\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059..."},
{"keyalg.option.1.missing.warning", "-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30AD\u30FC\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0(%s)\u306F\u3001\u65E7\u5F0F\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3067\u3001\u73FE\u5728\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002JDK\u306E\u5F8C\u7D9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3001-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
{"keyalg.option.missing.error", "-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},

{"showinfo.no.option", "-showinfo\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\"keytool -showinfo -tls\"\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
};
@@ -466,7 +466,7 @@
{"migrate.keystore.warning", "\u5DF2\u5C06 \"%1$s\" \u8FC1\u79FB\u5230 %4$s\u3002\u5C06 %2$s \u5BC6\u94A5\u5E93\u4F5C\u4E3A \"%3$s\" \u8FDB\u884C\u4E86\u5907\u4EFD\u3002"},
{"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."},
{"importing.keystore.status", "\u6B63\u5728\u5C06\u5BC6\u94A5\u5E93 %1$s \u5BFC\u5165\u5230 %2$s..."},
{"keyalg.option.1.missing.warning", "\u65E0 -keyalg \u9009\u9879\u3002\u9ED8\u8BA4\u5BC6\u94A5\u7B97\u6CD5 (%s) \u662F\u4F20\u7EDF\u7B97\u6CD5\uFF0C\u4E0D\u518D\u63A8\u8350\u3002\u5728 JDK \u7684\u540E\u7EED\u53D1\u884C\u7248\u4E2D\uFF0C\u5C06\u5220\u9664\u9ED8\u8BA4\u503C\uFF0C\u60A8\u5FC5\u987B\u6307\u5B9A -keyalg \u9009\u9879\u3002"},
{"keyalg.option.missing.error", "\u5FC5\u987B\u6307\u5B9A -keyalg \u9009\u9879\u3002"},

{"showinfo.no.option", "-showinfo \u7F3A\u5C11\u9009\u9879\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 \"keytool -showinfo -tls\"\u3002"},
};
@@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2019
*/
public class XPATHErrorResources_ja extends ListResourceBundle
{
@@ -150,6 +150,10 @@
"ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG";
public static final String ER_PREDICATE_ILLEGAL_SYNTAX =
"ER_PREDICATE_ILLEGAL_SYNTAX";
public static final String ER_PREDICATE_TOO_MANY_OPEN =
"ER_PREDICATE_TOO_MANY_OPEN";
public static final String ER_COMPILATION_TOO_MANY_OPERATION =
"ER_COMPILATION_TOO_MANY_OPERATION";
public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME";
public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE";
public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED =
@@ -464,6 +468,12 @@
{ ER_PREDICATE_ILLEGAL_SYNTAX,
"'..[predicate]'\u307E\u305F\u306F'.[predicate]'\u306F\u4E0D\u6B63\u306A\u69CB\u6587\u3067\u3059\u3002\u304B\u308F\u308A\u306B'self::node()[predicate]'\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},

{ ER_PREDICATE_TOO_MANY_OPEN,
"{1}\u3067{0}\u3092\u89E3\u6790\u4E2D\u306B\u30B9\u30BF\u30C3\u30AF\u30FB\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30AA\u30FC\u30D7\u30F3\u8FF0\u8A9E\u304C\u591A\u3059\u304E\u307E\u3059({2})\u3002"},

{ ER_COMPILATION_TOO_MANY_OPERATION,
"\u5F0F\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u4E2D\u306B\u30B9\u30BF\u30C3\u30AF\u30FB\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u64CD\u4F5C\u304C\u591A\u3059\u304E\u307E\u3059({0})\u3002"},

{ ER_ILLEGAL_AXIS_NAME,
"\u4E0D\u6B63\u306A\u8EF8\u540D: {0}"},

@@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2019
*/
public class XPATHErrorResources_zh_CN extends ListResourceBundle
{
@@ -150,6 +150,10 @@
"ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG";
public static final String ER_PREDICATE_ILLEGAL_SYNTAX =
"ER_PREDICATE_ILLEGAL_SYNTAX";
public static final String ER_PREDICATE_TOO_MANY_OPEN =
"ER_PREDICATE_TOO_MANY_OPEN";
public static final String ER_COMPILATION_TOO_MANY_OPERATION =
"ER_COMPILATION_TOO_MANY_OPERATION";
public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME";
public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE";
public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED =
@@ -464,6 +468,12 @@
{ ER_PREDICATE_ILLEGAL_SYNTAX,
"'..[predicate]' \u6216 '.[predicate]' \u662F\u975E\u6CD5\u8BED\u6CD5\u3002\u8BF7\u6539\u7528 'self::node()[predicate]'\u3002"},

{ ER_PREDICATE_TOO_MANY_OPEN,
"\u5BF9 {1} \u4E2D\u7684 {0} \u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u5806\u6808\u6EA2\u51FA\u3002\u672A\u7ED3\u675F\u7684\u8C13\u8BCD\u592A\u591A ({2})\u3002"},

{ ER_COMPILATION_TOO_MANY_OPERATION,
"\u7F16\u8BD1\u8868\u8FBE\u5F0F\u65F6\u5806\u6808\u6EA2\u51FA\u3002\u8FD0\u7B97\u592A\u591A ({0})\u3002"},

{ ER_ILLEGAL_AXIS_NAME,
"\u975E\u6CD5\u8F74\u540D\u79F0: {0}"},

0 comments on commit b7cdc09

Please sign in to comment.